Add query execution impl:

- Add to new queries map - Add new command to ametsuchi: hasGrantablePermission - Add tests to query executor Fix query execution test: - Add mock methods Fix query execution: - Add moves - Add corrected 'expect-calls' Add clang-format rule for non-assignment binary operators, fix json Fix review issues
Ignitus · Sep 26, 2017 · 3bdc2e1 · 3bdc2e1
1 parent edbfb0d
commit 3bdc2e1
Show file tree

Hide file tree

Showing 40 changed files with 393 additions and 224 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,2 +1,4 @@
 BasedOnStyle: Google
 NamespaceIndentation: All
+BreakBeforeBinaryOperators: NonAssignment
+AlignOperands: false
diff --git a/iroha-cli/interactive/impl/interactive_transaction_cli.cpp b/iroha-cli/interactive/impl/interactive_transaction_cli.cpp
@@ -193,8 +193,10 @@ namespace iroha_cli {
     std::shared_ptr<iroha::model::Command>
     InteractiveTransactionCli::parseCreateRole(
         std::vector<std::string> params) {
+      // TODO: implement scheme on working with permissions
       auto role = params[0];
-      return std::make_shared<CreateRole>(role);
+      std::vector<std::string> perms  = {};
+      return std::make_shared<CreateRole>(role, perms);
     }
 
     std::shared_ptr<iroha::model::Command>

diff --git a/irohad/ametsuchi/impl/postgres_wsv_query.cpp b/irohad/ametsuchi/impl/postgres_wsv_query.cpp
@@ -32,6 +32,13 @@ namespace iroha {
     PostgresWsvQuery::PostgresWsvQuery(pqxx::nontransaction &transaction)
         : transaction_(transaction) {}
 
+    bool PostgresWsvQuery::hasAccountGrantablePermission(
+        const std::string &permitee_account_id, const std::string &account_id,
+        const std::string &permission_id) {
+      // TODO: implement
+      return false;
+    };
+
     nonstd::optional<std::vector<std::string>>
     PostgresWsvQuery::getAccountRoles(const std::string &account_id) {
       // TODO: implement

diff --git a/irohad/ametsuchi/impl/postgres_wsv_query.hpp b/irohad/ametsuchi/impl/postgres_wsv_query.hpp
@@ -42,6 +42,9 @@ namespace iroha {
           const std::string &account_id, const std::string &asset_id) override;
       nonstd::optional<std::vector<model::Peer>> getPeers() override;
       nonstd::optional<std::vector<std::string>> getRoles() override;
+      bool hasAccountGrantablePermission(
+          const std::string &permitee_account_id, const std::string &account_id,
+          const std::string &permission_id) override;
 
      private:
       pqxx::nontransaction &transaction_;

diff --git a/irohad/ametsuchi/wsv_query.hpp b/irohad/ametsuchi/wsv_query.hpp
@@ -37,6 +37,18 @@ namespace iroha {
      public:
       virtual ~WsvQuery() = default;
 
+      /**
+       * Check if permitee has permission on account
+       * @param permitee_account_id
+       * @param account_id
+       * @param permission_id
+       * @return true if has permission, false otherwise
+       */
+      virtual bool
+      hasAccountGrantablePermission(const std::string &permitee_account_id,
+                                    const std::string &account_id,
+                                    const std::string &permission_id) = 0;
+
       /**
        * Get account's roles
        * @param account_id

diff --git a/irohad/model/block.hpp b/irohad/model/block.hpp
@@ -89,9 +89,7 @@ namespace iroha {
       using TransactionsType = decltype(transactions);
 
       bool operator==(const Block& rhs) const;
-      bool operator!=(const Block& rhs) const {
-        return !operator==(rhs);
-      };
+      bool operator!=(const Block& rhs) const;
     };
   }
 }

diff --git a/irohad/model/command.hpp b/irohad/model/command.hpp
@@ -32,9 +32,7 @@ namespace iroha {
 
       virtual bool operator==(const Command& rhs) const = 0;
 
-      virtual bool operator!=(const Command& rhs) const {
-        return !operator==(rhs);
-      }
+      virtual bool operator!=(const Command& rhs) const;
     };
   }  // namespace model
 }  // namespace iroha

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

diff --git a/irohad/model/commands/add_peer.hpp b/irohad/model/commands/add_peer.hpp
@@ -33,11 +33,11 @@ namespace iroha {
 
       std::string address;
 
-      bool operator==(const Command& command) const override;
+      bool operator==(const Command &command) const override;
 
       AddPeer() {}
 
-      AddPeer(ed25519::pubkey_t peer_key, std::string address)
+      AddPeer(const ed25519::pubkey_t &peer_key, const std::string &address)
           : peer_key(peer_key), address(address) {}
     };
   }  // namespace model

diff --git a/irohad/model/commands/add_signatory.hpp b/irohad/model/commands/add_signatory.hpp
@@ -39,11 +39,12 @@ namespace iroha {
        */
       ed25519::pubkey_t pubkey;
 
-      bool operator==(const Command& command) const override;
+      bool operator==(const Command &command) const override;
 
       AddSignatory() {}
 
-      AddSignatory(std::string account_id, ed25519::pubkey_t pubkey)
+      AddSignatory(const std::string &account_id,
+                   const ed25519::pubkey_t &pubkey)
           : account_id(account_id), pubkey(pubkey) {}
     };
   }  // namespace model

diff --git a/irohad/model/commands/append_role.hpp b/irohad/model/commands/append_role.hpp
@@ -36,11 +36,11 @@ namespace iroha {
        */
       std::string role_name;
 
-      bool operator==(const Command& command) const override;
+      bool operator==(const Command &command) const override;
 
-      AppendRole(){}
+      AppendRole() {}
 
-      AppendRole(std::string account_id_, std::string role_name_)
+      AppendRole(const std::string &account_id_, const std::string &role_name_)
           : account_id(account_id_), role_name(role_name_) {}
     };
   }  // namespace model

diff --git a/irohad/model/commands/create_account.hpp b/irohad/model/commands/create_account.hpp
@@ -42,12 +42,13 @@ namespace iroha {
        */
       ed25519::pubkey_t pubkey;
 
-      bool operator==(const Command& command) const override;
+      bool operator==(const Command &command) const override;
 
       CreateAccount() {}
 
-      CreateAccount(std::string account_name, std::string domain_id,
-                    ed25519::pubkey_t pubkey)
+      CreateAccount(const std::string &account_name,
+                    const std::string &domain_id,
+                    const ed25519::pubkey_t &pubkey)
           : account_name(account_name), domain_id(domain_id), pubkey(pubkey) {}
     };
   }  // namespace model

diff --git a/irohad/model/commands/create_asset.hpp b/irohad/model/commands/create_asset.hpp
@@ -44,11 +44,11 @@ namespace iroha {
        */
       uint8_t precision;
 
-      bool operator==(const Command& command) const override;
+      bool operator==(const Command &command) const override;
 
       CreateAsset() {}
 
-      CreateAsset(std::string asset_name, std::string domain_id,
+      CreateAsset(const std::string &asset_name, const std::string &domain_id,
                   uint8_t precision)
           : asset_name(asset_name),
             domain_id(domain_id),

diff --git a/irohad/model/commands/create_domain.hpp b/irohad/model/commands/create_domain.hpp
@@ -36,8 +36,8 @@ namespace iroha {
 
       CreateDomain() {}
 
-      CreateDomain(std::string domain_name) : domain_name(domain_name) {}
+      CreateDomain(const std::string& domain_name) : domain_name(domain_name) {}
     };
   }  // namespace model
-}
+}  // namespace iroha
 #endif  // IROHA_CREATE_DOMAIN_HPP
diff --git a/irohad/model/commands/create_role.hpp b/irohad/model/commands/create_role.hpp
@@ -17,8 +17,8 @@
 #ifndef IROHA_CREATE_ROLE_HPP
 #define IROHA_CREATE_ROLE_HPP
 
-#include "model/command.hpp"
 #include <string>
+#include "model/command.hpp"
 
 namespace iroha {
   namespace model {
@@ -32,13 +32,18 @@ namespace iroha {
        */
       std::string role_name;
 
-      bool operator==(const Command& command) const override;
+      /**
+       * Role permissions
+       */
+      std::vector<std::string> permissions;
 
-      CreateRole(){}
+      bool operator==(const Command &command) const override;
 
-      CreateRole(std::string role_name_)
-      : role_name(role_name_) {}
+      CreateRole() {}
 
+      CreateRole(const std::string &role_name_,
+                 const std::vector<std::string> &perms)
+          : role_name(role_name_), permissions(perms) {}
     };
   }  // namespace model
 }  // namespace iroha

diff --git a/irohad/model/commands/grant_permission.hpp b/irohad/model/commands/grant_permission.hpp
@@ -28,10 +28,10 @@ namespace iroha {
      * Grant permission from creator to account_id
      */
     struct GrantPermission : public Command {
-
       /**
        * Account to which grant the permission.
-       * Permission will be granted from creator to account_id on *permission_name*
+       * Permission will be granted from creator to account_id on
+       * *permission_name*
        */
       std::string account_id;
 
@@ -40,14 +40,13 @@ namespace iroha {
        */
       std::string permission_name;
 
-      bool operator==(const Command& command) const override;
+      bool operator==(const Command &command) const override;
 
       GrantPermission() {}
 
-      GrantPermission(std::string account_id_,
-                      std::string permission_name_)
-          : account_id(account_id_),
-            permission_name(permission_name_) {}
+      GrantPermission(const std::string &account_id_,
+                      const std::string &permission_name_)
+          : account_id(account_id_), permission_name(permission_name_) {}
     };
   }  // namespace model
 }  // namespace iroha

diff --git a/irohad/model/commands/remove_signatory.hpp b/irohad/model/commands/remove_signatory.hpp
@@ -40,11 +40,12 @@ namespace iroha {
        */
       ed25519::pubkey_t pubkey;
 
-      bool operator==(const Command& command) const override;
+      bool operator==(const Command &command) const override;
 
       RemoveSignatory() {}
 
-      RemoveSignatory(std::string account_id, ed25519::pubkey_t pubkey)
+      RemoveSignatory(const std::string &account_id,
+                      const ed25519::pubkey_t &pubkey)
           : account_id(account_id), pubkey(pubkey) {}
     };
   }  // namespace model

diff --git a/irohad/model/commands/revoke_permission.hpp b/irohad/model/commands/revoke_permission.hpp
@@ -38,11 +38,12 @@ namespace iroha {
        */
       std::string permission_name;
 
-      bool operator==(const Command& command) const override;
+      bool operator==(const Command &command) const override;
 
       RevokePermission() {}
 
-      RevokePermission(std::string account_id_, std::string permission_name_)
+      RevokePermission(const std::string &account_id_,
+                       const std::string &permission_name_)
           : account_id(account_id_), permission_name(permission_name_) {}
     };
   }  // namespace model

diff --git a/irohad/model/commands/set_quorum.hpp b/irohad/model/commands/set_quorum.hpp
@@ -38,11 +38,11 @@ namespace iroha {
        */
       uint32_t new_quorum;
 
-      bool operator==(const Command& command) const override;
+      bool operator==(const Command &command) const override;
 
       SetQuorum() {}
 
-      SetQuorum(std::string account_id, uint32_t new_quorum)
+      SetQuorum(const std::string &account_id, uint32_t new_quorum)
           : account_id(account_id), new_quorum(new_quorum) {}
     };
   }  // namespace model

diff --git a/irohad/model/commands/transfer_asset.hpp b/irohad/model/commands/transfer_asset.hpp
@@ -54,12 +54,13 @@ namespace iroha {
        */
       Amount amount;
 
-      bool operator==(const Command& command) const override;
+      bool operator==(const Command &command) const override;
 
       TransferAsset() {}
 
-      TransferAsset(std::string src_account_id, std::string dest_account_id,
-                    std::string asset_id, Amount amount)
+      TransferAsset(const std::string &src_account_id,
+                    const std::string &dest_account_id,
+                    const std::string &asset_id, const Amount &amount)
           : src_account_id(src_account_id),
             dest_account_id(dest_account_id),
             asset_id(asset_id),

diff --git a/irohad/model/converters/impl/json_block_factory.cpp b/irohad/model/converters/impl/json_block_factory.cpp
@@ -36,7 +36,8 @@ namespace iroha {
         Value signatures;
         signatures.SetArray();
         for (const auto &signature : block.sigs) {
-          signatures.PushBack(serializeSignature(signature, allocator), allocator);
+          signatures.PushBack(serializeSignature(signature, allocator),
+                              allocator);
         }
         document.AddMember("signatures", signatures, allocator);
 
@@ -67,14 +68,13 @@ namespace iroha {
         auto des = makeFieldDeserializer(document);
         auto des_transactions = [this](auto array) {
           auto acc_transactions = [this](auto init, auto &x) {
-            return init
-                | [this, &x](auto transactions) {
-                    return factory_.deserialize(x)
-                        | [&transactions](auto transaction) {
-                            transactions.push_back(transaction);
-                            return nonstd::make_optional(transactions);
-                          };
+            return init | [this, &x](auto transactions) {
+              return factory_.deserialize(x) |
+                  [&transactions](auto transaction) {
+                    transactions.push_back(transaction);
+                    return nonstd::make_optional(transactions);
                   };
+            };
           };
           return std::accumulate(
               array.begin(), array.end(),