Add minor fixes:

- Add comments - Remove todo Signed-off-by: grimadas <[email protected]>
neo4reo · Dec 19, 2017 · f002975 · f002975
1 parent 5ac8e15
commit f002975
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 20 deletions.
diff --git a/shared_model/interfaces/commands/add_peer.hpp b/shared_model/interfaces/commands/add_peer.hpp
@@ -45,16 +45,15 @@ namespace shared_model {
       std::string toString() const override {
         return detail::PrettyStringBuilder()
             .init("AddPeer")
-            .append("peer_key", peerKey().toString())
+            .append(peerKey().toString())
             .append("peer_address", peerAddress())
             .finalize();
       }
 
       OldModelType *makeOldModel() const override {
         auto oldModel = new iroha::model::AddPeer;
         oldModel->address = peerAddress();
-        // TODO: check if this is right
-        oldModel->peer_key.from_string(peerKey().blob());
+        oldModel->peer_key.from_string(peerKey().makeOldModel()->blob());
         return oldModel;
       }
     };

diff --git a/shared_model/interfaces/commands/add_signatory.hpp b/shared_model/interfaces/commands/add_signatory.hpp
@@ -50,8 +50,7 @@ namespace shared_model {
 
       OldModelType *makeOldModel() const override {
         auto oldModel = new iroha::model::AddSignatory;
-        // TODO: check if this is right
-        oldModel->pubkey.from_string(pubkey().blob());
+        oldModel->pubkey.from_string(pubkey().makeOldModel()->blob());
         oldModel->account_id = accountId();
         return oldModel;
       }

diff --git a/shared_model/interfaces/commands/create_account.hpp b/shared_model/interfaces/commands/create_account.hpp
@@ -51,16 +51,15 @@ namespace shared_model {
             .init("CreateAccount")
             .append("account_name", accountName())
             .append("domain_id", domainId())
-            .append("pubkey", pubkey().toString())
+            .append(pubkey().toString())
             .finalize();
       }
 
       OldModelType *makeOldModel() const override {
         auto oldModel = new iroha::model::CreateAccount;
         oldModel->account_name = accountName();
         oldModel->domain_id = domainId();
-        //  TODO: check if this is right
-        oldModel->pubkey.from_string(pubkey().blob());
+        oldModel->pubkey.from_string(pubkey().makeOldModel()->blob());
         return oldModel;
       }
     };

diff --git a/shared_model/interfaces/commands/create_role.hpp b/shared_model/interfaces/commands/create_role.hpp
@@ -35,7 +35,7 @@ namespace shared_model {
        * @return Id of the domain to create
        */
       virtual const types::RoleIdType &roleName() const = 0;
-      /// Set of Permissions
+      /// Set of Permissions to insure the order for consistent hash
       using PermissionsType = std::set<std::string>;
       /**
        * @return permissions associated with the role
@@ -44,17 +44,12 @@ namespace shared_model {
 
       std::string toString() const override {
         auto roles_set = rolePermissions();
-        std::string roles_accum =
-            std::accumulate(std::begin(roles_set),
-                            std::end(roles_set),
-                            std::string{},
-                            [](const std::string &a, const std::string &b) {
-                              return a.empty() ? b : a + ", " + b;
-                            });
         return detail::PrettyStringBuilder()
             .init("CreateRole")
             .append("role_name", roleName())
-            .append("Role_permissions", roles_accum)
+            .appendAll(roles_set, [](auto& role){
+              return role;
+            })
             .finalize();
       }
 

diff --git a/shared_model/interfaces/commands/remove_signatory.hpp b/shared_model/interfaces/commands/remove_signatory.hpp
@@ -43,15 +43,14 @@ namespace shared_model {
         return detail::PrettyStringBuilder()
             .init("RemoveSignatory")
             .append("account_id", accountId())
-            .append("pubkey", pubkey().toString())
+            .append(pubkey().toString())
             .finalize();
       }
 
       OldModelType *makeOldModel() const override {
         auto oldModel = new iroha::model::RemoveSignatory;
         oldModel->account_id = accountId();
-        // TODO: check if this is right
-        oldModel->pubkey.from_string(pubkey().blob());
+        oldModel->pubkey.from_string(pubkey().makeOldModel()->blob());
         return oldModel;
       }
     };