Merge branch 'feature/pb-factories' of https://github.com/hyperledger…

…/iroha into feature/pb-factories
grimadas · Jul 19, 2017 · d58623a · d58623a
2 parents ef72443 + 4f9b473
commit d58623a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/irohad/model/converters/impl/pb_command_factory.cpp b/irohad/model/converters/impl/pb_command_factory.cpp
@@ -267,7 +267,7 @@ namespace iroha {
         return transfer_asset;
       }
 
-      protocol::Command &&
+      protocol::Command
       PbCommandFactory::serializeAbstractCommand(const model::Command &command) {
         PbCommandFactory commandFactory;
         auto cmd = protocol::Command();
@@ -365,7 +365,7 @@ namespace iroha {
               serialized));
         }
 
-        return std::forward<protocol::Command>(cmd);
+        return cmd;
       }
 
       std::shared_ptr<model::Command>

diff --git a/irohad/model/converters/pb_command_factory.hpp b/irohad/model/converters/pb_command_factory.hpp
@@ -85,7 +85,7 @@ namespace iroha {
         model::TransferAsset deserializeTransferAsset(const protocol::TransferAsset &subtractAssetQuantity);
 
         // abstract
-        protocol::Command &&serializeAbstractCommand(const model::Command &command);
+        protocol::Command serializeAbstractCommand(const model::Command &command);
         std::shared_ptr<model::Command> deserializeAbstractCommand(const protocol::Command &command);
       };
     } // namespace converters

diff --git a/irohad/model/impl/model_operators.cpp b/irohad/model/impl/model_operators.cpp
@@ -194,8 +194,12 @@ namespace iroha {
 
     /* Transaction */
     bool Transaction::operator==(const Transaction &rhs) const {
+      if (rhs.commands.size() != commands.size()) return false;
+      for (uint i = 0; i < rhs.commands.size(); i++){
+        if (*rhs.commands.at(i) != *commands.at(i)) return false;
+      }
       return rhs.tx_counter == tx_counter && rhs.signatures == signatures &&
-             rhs.created_ts == created_ts && rhs.commands == commands;
+             rhs.created_ts == created_ts;
     }
 
     bool Transaction::operator!=(const Transaction &rhs) const {

diff --git a/test/module/irohad/model/converters/pb_transaction_test.cpp b/test/module/irohad/model/converters/pb_transaction_test.cpp
@@ -62,6 +62,21 @@ TEST(TransactionTest, tx_test) {
 
   auto factory = iroha::model::converters::PbTransactionFactory();
   auto proto_tx = factory.serialize(orig_tx);
+  switch (proto_tx.body().commands().Get(0).command_case()){
+
+    case iroha::protocol::Command::kAddAssetQuantity:break;
+    case iroha::protocol::Command::kAddPeer:break;
+    case iroha::protocol::Command::kAddSignatory:break;
+    case iroha::protocol::Command::kAccountAssignMk:break;
+    case iroha::protocol::Command::kCreateAsset:break;
+    case iroha::protocol::Command::kCreateAccount:break;
+    case iroha::protocol::Command::kCreateDomain:break;
+    case iroha::protocol::Command::kRemoveSign:break;
+    case iroha::protocol::Command::kSetPermission:break;
+    case iroha::protocol::Command::kSetQuorum:break;
+    case iroha::protocol::Command::kTransferAsset:break;
+    case iroha::protocol::Command::COMMAND_NOT_SET:break;
+  }
   auto serial_tx = factory.deserialize(proto_tx);
   ASSERT_EQ(orig_tx, serial_tx);
 }