Implement addition of new parameters to Iroha Core for enhanced messa…

…ge communication, with corresponding handling capabilities in Iroha CLI. Signed-off-by: dominious1 <[email protected]>
hyperledger-iroha · Nov 12, 2023 · 5858cf0 · 5858cf0
1 parent f2d96e3
commit 5858cf0
Show file tree

Hide file tree

Showing 24 changed files with 93 additions and 30 deletions.
diff --git a/iroha-cli/interactive/impl/interactive_transaction_cli.cpp b/iroha-cli/interactive/impl/interactive_transaction_cli.cpp
@@ -325,7 +325,8 @@ namespace iroha_cli {
         std::vector<std::string> params) {
       auto asset_id = params[0];
       auto amount = params[1];
-      return generator_.generateAddAssetQuantity(asset_id, amount);
+      auto title = params[2];
+      return generator_.generateAddAssetQuantity(asset_id, amount, title);
     }
 
     std::shared_ptr<iroha::model::Command>
@@ -405,7 +406,8 @@ namespace iroha_cli {
         std::vector<std::string> params) {
       auto asset_id = params[0];
       auto amount = params[1];
-      return generator_.generateSubtractAssetQuantity(asset_id, amount);
+      auto title = params[2];
+      return generator_.generateSubtractAssetQuantity(asset_id, amount, title);
     }
 
     std::shared_ptr<iroha::model::Command>

diff --git a/iroha-lib/examples/DomainAssetCreation.cpp b/iroha-lib/examples/DomainAssetCreation.cpp
@@ -136,7 +136,7 @@ iroha::protocol::Transaction generateTransactionWhichAddsAssetQuantiti(
     return iroha_lib::Tx(
                 account_name,
                 keypair)
-            .addAssetQuantity(assetIdWithDomain, assetAmount)
+            .addAssetQuantity(assetIdWithDomain, assetAmount, "")
             .signAndAddSignature();
 }
 

diff --git a/iroha-lib/model/Tx.cpp b/iroha-lib/model/Tx.cpp
@@ -20,11 +20,13 @@ void Tx::addCommand(const iroha::protocol::Command& command)
 
 Tx& Tx::addAssetQuantity(
         const std::string& asset_id,
-        const std::string& amount)
+        const std::string& amount,
+        const std::string& title)
 {
     auto cmd = cmd_generator_.generateAddAssetQuantity(
                 asset_id,
-                amount);
+                amount,
+                title);
     addCommand(*cmd);
     return *this;
 }
@@ -180,11 +182,13 @@ Tx& Tx::setAccountQuorum(
 
 Tx& Tx::subtractAssetQuantity(
         const std::string& asset_id,
-        const std::string& amount)
+        const std::string& amount,
+        const std::string& title)
 {
     auto cmd = cmd_generator_.generateSubtractAssetQuantity(
                 asset_id,
-                amount);
+                amount,
+                title);
     addCommand(*cmd);
     return *this;
 }

diff --git a/iroha-lib/model/Tx.hpp b/iroha-lib/model/Tx.hpp
@@ -33,8 +33,9 @@ class Tx {
     void addCommand(const iroha::protocol::Command& command);
 
     Tx& addAssetQuantity(
-            const std::string& account_id,
-            const std::string& role_name);
+            const std::string& asset_id,
+            const std::string& amount,
+            const std::string& title);
     Tx& addPeer(
             const std::string& address,
             const std::string& pubkey,
@@ -83,7 +84,8 @@ class Tx {
             uint32_t quorum);
     Tx& subtractAssetQuantity(
             const std::string& asset_id,
-            const std::string& amount);
+            const std::string& amount,
+            const std::string& title);
     Tx& transferAsset(
             const std::string& account_id,
             const std::string& dest_account_id,

diff --git a/iroha-lib/model/generators/CommandGenerator.cpp b/iroha-lib/model/generators/CommandGenerator.cpp
@@ -6,11 +6,15 @@ namespace iroha_lib {
 
 std::shared_ptr<Command> CommandGenerator::generateAddAssetQuantity(
         const std::string& asset_id,
-        const std::string& amount)
+        const std::string& amount,
+        const std::string& title)
 {
     AddAssetQuantity addAssetQuantity;
     addAssetQuantity.set_asset_id(asset_id);
     addAssetQuantity.set_amount(amount);
+    if (!title.empty()) {
+      addAssetQuantity.set_title(title);
+    }
 
     auto cmd = Command();
     cmd.set_allocated_add_asset_quantity(new AddAssetQuantity(addAssetQuantity));
@@ -227,11 +231,16 @@ std::shared_ptr<Command> CommandGenerator::generateSetAccountQuorum(
 
 std::shared_ptr<Command> CommandGenerator::generateSubtractAssetQuantity(
         const std::string& asset_id,
-        const std::string& amount)
+        const std::string& amount,
+        const std::string& title)
 {
     SubtractAssetQuantity subtractAssetQuantity;
     subtractAssetQuantity.set_asset_id(asset_id);
     subtractAssetQuantity.set_amount(amount);
+    std::optional<std::string> title_optional = title;
+    if (title_optional) {
+        subtractAssetQuantity.set_title(*title_optional);
+    }
 
     auto cmd = Command();
     cmd.set_allocated_subtract_asset_quantity(new SubtractAssetQuantity(subtractAssetQuantity));

diff --git a/iroha-lib/model/generators/CommandGenerator.hpp b/iroha-lib/model/generators/CommandGenerator.hpp
@@ -20,7 +20,8 @@ class CommandGenerator {
 
     std::shared_ptr<Command> generateAddAssetQuantity(
             const std::string& asset_id,
-            const std::string& amount);
+            const std::string& amount,
+            const std::string& title);
     std::shared_ptr<Command> generateAddPeer(
             const std::string& address,
             const std::string& pubkey,
@@ -67,7 +68,8 @@ class CommandGenerator {
             const std::string& account_id, uint32_t quorum);
     std::shared_ptr<Command> generateSubtractAssetQuantity(
             const std::string& asset_id,
-            const std::string& amount);
+            const std::string& amount,
+            const std::string& title);
     std::shared_ptr<Command> generateTransferAsset(
             const std::string& account_id,
             const std::string& dest_account_id,

diff --git a/irohad/model/commands/add_asset_quantity.hpp b/irohad/model/commands/add_asset_quantity.hpp
@@ -27,12 +27,17 @@ namespace iroha {
        */
       std::string amount;
 
+      /**
+       * Title
+       */
+      std::string title;
+
       bool operator==(const Command &command) const override;
 
       AddAssetQuantity() {}
 
-      AddAssetQuantity(const std::string &asset_id, const std::string &amount)
-          : asset_id(asset_id), amount(amount) {}
+      AddAssetQuantity(const std::string &asset_id, const std::string &amount, const std::string &title)
+          : asset_id(asset_id), amount(amount), title(title) {}
     };
   }  // namespace model
 }  // namespace iroha

diff --git a/irohad/model/commands/subtract_asset_quantity.hpp b/irohad/model/commands/subtract_asset_quantity.hpp
@@ -26,13 +26,19 @@ namespace iroha {
        */
       std::string amount;
 
+      /**
+       * Title
+       */
+      std::string title;
+
       bool operator==(const Command &command) const override;
 
       SubtractAssetQuantity() {}
 
       SubtractAssetQuantity(const std::string &asset_id,
-                            const std::string &amount)
-          : asset_id(asset_id), amount(amount) {}
+                            const std::string &amount,
+                            const std::string &title)
+          : asset_id(asset_id), amount(amount), title(title) {}
     };
   }  // namespace model
 }  // namespace iroha

diff --git a/irohad/model/converters/impl/json_command_factory.cpp b/irohad/model/converters/impl/json_command_factory.cpp
@@ -113,6 +113,7 @@ namespace iroha {
         document.AddMember("command_type", "AddAssetQuantity", allocator);
         document.AddMember("asset_id", add_asset_quantity->asset_id, allocator);
         document.AddMember("amount", add_asset_quantity->amount, allocator);
+        document.AddMember("title", add_asset_quantity->title, allocator);
 
         return document;
       }
@@ -122,7 +123,8 @@ namespace iroha {
         auto des = makeFieldDeserializer(document);
         return make_optional_ptr<AddAssetQuantity>()
             | des.String(&AddAssetQuantity::asset_id, "asset_id")
-            | des.String(&AddAssetQuantity::amount, "amount") | toCommand;
+            | des.String(&AddAssetQuantity::amount, "amount")
+            | des.String(&AddAssetQuantity::title, "title") | toCommand;
       }
 
       // AddPeer
@@ -520,7 +522,8 @@ namespace iroha {
         auto des = makeFieldDeserializer(document);
         return make_optional_ptr<SubtractAssetQuantity>()
             | des.String(&SubtractAssetQuantity::asset_id, "asset_id")
-            | des.String(&SubtractAssetQuantity::amount, "amount") | toCommand;
+            | des.String(&SubtractAssetQuantity::amount, "amount")
+            | des.String(&SubtractAssetQuantity::title, "title") | toCommand;
       }
 
       // Abstract

diff --git a/irohad/model/converters/impl/pb_command_factory.cpp b/irohad/model/converters/impl/pb_command_factory.cpp
@@ -200,7 +200,7 @@ namespace iroha {
         subtract_asset_quantity.asset_id =
             pb_subtract_asset_quantity.asset_id();
         subtract_asset_quantity.amount = pb_subtract_asset_quantity.amount();
-
+        subtract_asset_quantity.title = pb_subtract_asset_quantity.title();
         return subtract_asset_quantity;
       }
 

diff --git a/irohad/model/generators/command_generator.hpp b/irohad/model/generators/command_generator.hpp
@@ -58,10 +58,10 @@ namespace iroha {
             const std::string &account_id, uint32_t quorum);
 
         std::shared_ptr<Command> generateAddAssetQuantity(
-            const std::string &asset_id, const std::string &amount);
+            const std::string &asset_id, const std::string &amount, const std::string &title);
 
         std::shared_ptr<Command> generateSubtractAssetQuantity(
-            const std::string &asset_id, const std::string &amount);
+            const std::string &asset_id, const std::string &amount, const std::string &title);
         /**
          * Generate transfer assets from source account_id to target account_id
          * @param src_account_id - source account identifier

diff --git a/irohad/model/generators/impl/command_generator.cpp b/irohad/model/generators/impl/command_generator.cpp
@@ -89,13 +89,13 @@ namespace iroha {
       }
 
       std::shared_ptr<Command> CommandGenerator::generateAddAssetQuantity(
-          const std::string &asset_id, const std::string &amount) {
-        return generateCommand<AddAssetQuantity>(asset_id, amount);
+          const std::string &asset_id, const std::string &amount, const std::string &title) {
+        return generateCommand<AddAssetQuantity>(asset_id, amount, title);
       }
 
       std::shared_ptr<Command> CommandGenerator::generateSubtractAssetQuantity(
-          const std::string &asset_id, const std::string &amount) {
-        return generateCommand<SubtractAssetQuantity>(asset_id, amount);
+          const std::string &asset_id, const std::string &amount, const std::string &title) {
+        return generateCommand<SubtractAssetQuantity>(asset_id, amount, title);
       }
 
       std::shared_ptr<Command> CommandGenerator::generateSetQuorum(

diff --git a/irohad/model/impl/model_operators.cpp b/irohad/model/impl/model_operators.cpp
@@ -100,7 +100,8 @@ namespace iroha {
       auto subtract_asset_quantity =
           static_cast<const SubtractAssetQuantity &>(command);
       return subtract_asset_quantity.asset_id == asset_id
-          && subtract_asset_quantity.amount == amount;
+          && subtract_asset_quantity.amount == amount
+          && subtract_asset_quantity.title == title;
     }
 
     /* AddPeer */

diff --git a/shared_model/backend/protobuf/commands/impl/proto_add_asset_quantity.cpp b/shared_model/backend/protobuf/commands/impl/proto_add_asset_quantity.cpp
@@ -20,5 +20,9 @@ namespace shared_model {
       return amount_;
     }
 
+    const std::string &AddAssetQuantity::title() const {
+      return title_;
+    }
+
   }  // namespace proto
 }  // namespace shared_model
diff --git a/shared_model/backend/protobuf/commands/impl/proto_subtract_asset_quantity.cpp b/shared_model/backend/protobuf/commands/impl/proto_subtract_asset_quantity.cpp
@@ -22,5 +22,9 @@ namespace shared_model {
       return amount_;
     }
 
+    const std::string &SubtractAssetQuantity::title() const {
+      return title_;
+    }
+
   }  // namespace proto
 }  // namespace shared_model
diff --git a/shared_model/backend/protobuf/commands/proto_add_asset_quantity.hpp b/shared_model/backend/protobuf/commands/proto_add_asset_quantity.hpp
@@ -21,10 +21,13 @@ namespace shared_model {
 
       const interface::Amount &amount() const override;
 
+      const std::string &title() const override;
+
      private:
       const iroha::protocol::AddAssetQuantity &add_asset_quantity_;
 
       const interface::Amount amount_;
+      const std::string title_;
     };
   }  // namespace proto
 }  // namespace shared_model

diff --git a/shared_model/backend/protobuf/commands/proto_subtract_asset_quantity.hpp b/shared_model/backend/protobuf/commands/proto_subtract_asset_quantity.hpp
@@ -22,10 +22,13 @@ namespace shared_model {
 
       const interface::Amount &amount() const override;
 
+      const std::string &title() const override;
+
      private:
       const iroha::protocol::SubtractAssetQuantity &subtract_asset_quantity_;
 
       const interface::Amount amount_;
+      const std::string title_;
     };
 
   }  // namespace proto

diff --git a/shared_model/interfaces/commands/add_asset_quantity.hpp b/shared_model/interfaces/commands/add_asset_quantity.hpp
@@ -28,6 +28,8 @@ namespace shared_model {
        */
       virtual const Amount &amount() const = 0;
 
+      virtual const std::string &title() const = 0;
+
       std::string toString() const override;
 
       bool operator==(const ModelType &rhs) const override;

diff --git a/shared_model/interfaces/commands/impl/add_asset_quantity.cpp b/shared_model/interfaces/commands/impl/add_asset_quantity.cpp
@@ -13,11 +13,12 @@ namespace shared_model {
           .init("AddAssetQuantity")
           .appendNamed("asset_id", assetId())
           .appendNamed("amount", amount())
+          .appendNamed("title", title())
           .finalize();
     }
 
     bool AddAssetQuantity::operator==(const ModelType &rhs) const {
-      return assetId() == rhs.assetId() and amount() == rhs.amount();
+      return assetId() == rhs.assetId() and amount() == rhs.amount() and title() == rhs.title();
     }
 
   }  // namespace interface

diff --git a/shared_model/interfaces/commands/impl/subtract_asset_quantity.cpp b/shared_model/interfaces/commands/impl/subtract_asset_quantity.cpp
@@ -13,11 +13,12 @@ namespace shared_model {
           .init("SubtractAssetQuantity")
           .appendNamed("asset_id", assetId())
           .appendNamed("amount", amount())
+          .appendNamed("title", title())
           .finalize();
     }
 
     bool SubtractAssetQuantity::operator==(const ModelType &rhs) const {
-      return assetId() == rhs.assetId() and amount() == rhs.amount();
+      return assetId() == rhs.assetId() and amount() == rhs.amount() and title() == rhs.title();
     }
 
   }  // namespace interface

diff --git a/shared_model/interfaces/commands/subtract_asset_quantity.hpp b/shared_model/interfaces/commands/subtract_asset_quantity.hpp
@@ -28,6 +28,11 @@ namespace shared_model {
        */
       virtual const Amount &amount() const = 0;
 
+      /**
+       * @return title
+      */
+      virtual const std::string &title() const = 0;
+
       std::string toString() const override;
 
       bool operator==(const ModelType &rhs) const override;

diff --git a/shared_model/schema/commands.proto b/shared_model/schema/commands.proto
@@ -13,6 +13,7 @@ import "primitive.proto";
 message AddAssetQuantity {
     string asset_id = 1;
     string amount = 2;
+    optional string title = 3;
 }
 
 message AddPeer {
@@ -97,6 +98,7 @@ message RevokePermission {
 message SubtractAssetQuantity {
     string asset_id = 1;
     string amount = 2;
+    optional string title = 3;
 }
 
 message CompareAndSetAccountDetail {

diff --git a/test/module/irohad/model/converters/json_commands_test.cpp b/test/module/irohad/model/converters/json_commands_test.cpp
@@ -71,6 +71,7 @@ TEST_F(JsonCommandTest, InvalidWhenUnknownCommandType) {
     "command_type": "Unknown",
     "account_id": "admin@test",
     "asset_id": "usd#test",
+    "title": "testtitle",
     "amount": {
         "int_part": -20,
         "frac_part": 0
@@ -95,6 +96,7 @@ TEST_F(JsonCommandTest, add_asset_quantity) {
 
   orig_command->amount = "1.50";
   orig_command->asset_id = "23";
+  orig_command->title = "testtitle";
 
   auto json_command = factory.serializeAddAssetQuantity(orig_command);
   auto serial_command = factory.deserializeAddAssetQuantity(json_command);