From 13fb1262f210970d6452ba203376b81aa79f43fe Mon Sep 17 00:00:00 2001 From: dominious1 <140593941+dominious1@users.noreply.github.com> Date: Thu, 2 Nov 2023 03:22:34 +0100 Subject: [PATCH 1/4] Small refactor to be in line with naming convention Signed-off-by: dominious1 <140593941+dominious1@users.noreply.github.com> --- irohad/model/commands/add_asset_quantity.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irohad/model/commands/add_asset_quantity.hpp b/irohad/model/commands/add_asset_quantity.hpp index 6fda8db27ba..f18011de5d3 100644 --- a/irohad/model/commands/add_asset_quantity.hpp +++ b/irohad/model/commands/add_asset_quantity.hpp @@ -28,7 +28,7 @@ namespace iroha { std::string amount; /** - * title + * Title */ std::string title; From 5cb60f78c6361b2a522ca11fabe7ef86b7c1d674 Mon Sep 17 00:00:00 2001 From: dominious1 <140593941+dominious1@users.noreply.github.com> Date: Thu, 2 Nov 2023 03:24:36 +0100 Subject: [PATCH 2/4] Changed description Signed-off-by: dominious1 <140593941+dominious1@users.noreply.github.com> --- shared_model/interfaces/commands/subtract_asset_quantity.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared_model/interfaces/commands/subtract_asset_quantity.hpp b/shared_model/interfaces/commands/subtract_asset_quantity.hpp index 547fa0f6d81..302f81e1638 100644 --- a/shared_model/interfaces/commands/subtract_asset_quantity.hpp +++ b/shared_model/interfaces/commands/subtract_asset_quantity.hpp @@ -29,7 +29,7 @@ namespace shared_model { virtual const Amount &amount() const = 0; /** - * @return quantity of asset for subtracting + * @return title */ virtual const std::string &title() const = 0; From 53c9a5045bf3aec0eac801287efbdcd18a09a402 Mon Sep 17 00:00:00 2001 From: dominious1 Date: Sun, 5 Nov 2023 00:27:03 +0100 Subject: [PATCH 3/4] Add title param to iroha-lib --- iroha-lib/model/Tx.cpp | 12 ++++++++---- iroha-lib/model/Tx.hpp | 6 ++++-- iroha-lib/model/generators/CommandGenerator.cpp | 12 ++++++++++-- iroha-lib/model/generators/CommandGenerator.hpp | 6 ++++-- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/iroha-lib/model/Tx.cpp b/iroha-lib/model/Tx.cpp index 7decba7fe67..c553c12ccb5 100644 --- 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 index 7e3b74cd5b3..18dc3229375 100644 --- a/iroha-lib/model/Tx.hpp +++ b/iroha-lib/model/Tx.hpp @@ -34,7 +34,8 @@ class Tx { Tx& addAssetQuantity( const std::string& account_id, - const std::string& role_name); + const std::string& role_name, + 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 index c1982b9bf07..29f4ffca394 100644 --- a/iroha-lib/model/generators/CommandGenerator.cpp +++ b/iroha-lib/model/generators/CommandGenerator.cpp @@ -6,11 +6,15 @@ namespace iroha_lib { std::shared_ptr 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,15 @@ std::shared_ptr CommandGenerator::generateSetAccountQuorum( std::shared_ptr 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); + if (!title.empty()) { // ToDo please check using sth more fancy std::optional + subtractAssetQuantity.set_title(title); + } 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 index 06948072839..93ed66cc633 100644 --- a/iroha-lib/model/generators/CommandGenerator.hpp +++ b/iroha-lib/model/generators/CommandGenerator.hpp @@ -20,7 +20,8 @@ class CommandGenerator { std::shared_ptr generateAddAssetQuantity( const std::string& asset_id, - const std::string& amount); + const std::string& amount, + const std::string& title); std::shared_ptr 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 generateSubtractAssetQuantity( const std::string& asset_id, - const std::string& amount); + const std::string& amount, + const std::string& title); std::shared_ptr generateTransferAsset( const std::string& account_id, const std::string& dest_account_id, From 454b46baf8b24765beac92fda281b43cd20c227f Mon Sep 17 00:00:00 2001 From: dominious1 Date: Mon, 6 Nov 2023 00:29:21 +0100 Subject: [PATCH 4/4] Refactor --- iroha-lib/model/Tx.hpp | 4 ++-- iroha-lib/model/generators/CommandGenerator.cpp | 5 +++-- .../protobuf/commands/impl/proto_add_asset_quantity.cpp | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/iroha-lib/model/Tx.hpp b/iroha-lib/model/Tx.hpp index 18dc3229375..7d2eceda521 100644 --- a/iroha-lib/model/Tx.hpp +++ b/iroha-lib/model/Tx.hpp @@ -33,8 +33,8 @@ 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, diff --git a/iroha-lib/model/generators/CommandGenerator.cpp b/iroha-lib/model/generators/CommandGenerator.cpp index 29f4ffca394..d5598fdf68d 100644 --- a/iroha-lib/model/generators/CommandGenerator.cpp +++ b/iroha-lib/model/generators/CommandGenerator.cpp @@ -237,8 +237,9 @@ std::shared_ptr CommandGenerator::generateSubtractAssetQuantity( SubtractAssetQuantity subtractAssetQuantity; subtractAssetQuantity.set_asset_id(asset_id); subtractAssetQuantity.set_amount(amount); - if (!title.empty()) { // ToDo please check using sth more fancy std::optional - subtractAssetQuantity.set_title(title); + std::optional title_optional = title; + if (title_optional) { + subtractAssetQuantity.set_title(*title_optional); } auto cmd = Command(); 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 index d1bffc708a4..1154c0f2f0f 100644 --- a/shared_model/backend/protobuf/commands/impl/proto_add_asset_quantity.cpp +++ b/shared_model/backend/protobuf/commands/impl/proto_add_asset_quantity.cpp @@ -24,6 +24,5 @@ namespace shared_model { return title_; } - } // namespace proto } // namespace shared_model