[fix] hotfix for commands positions

Signed-off-by: alexstroke <111361420+astrokov7@users.noreply.github.com>
Signed-off-by: Stukalov-A-M <stukalov07@gmail.com>

client/tests/integration/multisignature_transaction.rs

@@ -55,7 +55,7 @@ fn multisignature_transactions_should_be_accepted_after_fully_signed() -> Result
     let client = Client::new(client_config.clone());
     let instructions = [mint_asset.clone()];
     let transaction = client.build_transaction(instructions, UnlimitedMetadata::new());
-    //The tx signed by the first account
+    // The tx signed by the first account
     let _ = client
         .submit_transaction(&client.sign_transaction(transaction.clone()))
         .expect_err("Transaction should not be added into the queue");
@@ -82,7 +82,7 @@ fn multisignature_transactions_should_be_accepted_after_fully_signed() -> Result
 
     client_config.key_pair = key_pair_2;
     let client_2 = Client::new(client_config);
-    //The tx signed by the second account
+    // The tx signed by the second account
     client_2.submit_transaction(&client_2.sign_transaction(transaction))?;
 
     thread::sleep(pipeline_time);

client_cli/pytests/README.md

@@ -164,7 +164,7 @@ The variables:
 
 ```shell
 CLIENT_CLI_BINARY=/path/to/iroha_client_cli
-CLIENT_CLI_CONFIG=/path/to/config.toml
+CLIENT_CLI_CONFIG=/path/to/client.toml
 TORII_API_PORT_MIN=8080
 TORII_API_PORT_MAX=8083
 ```

client_cli/pytests/src/client_cli/client_cli.py

@@ -129,7 +129,7 @@ def domain(self, domain: str):
         :return: The current ClientCli object.
         :rtype: ClientCli
         """
-        self.command.insert(3, "domain")
+        self.command.insert(2, "domain")
         self.command.append("--id=" + domain)
         self.execute()
         return self
@@ -147,7 +147,7 @@ def account(self, account: str, domain: str, key: str):
         :return: The current ClientCli object.
         :rtype: ClientCli
         """
-        self.command.insert(3, "account")
+        self.command.insert(2, "account")
         self.command.append("--id=" + account + "@" + domain)
         self.command.append("--key=ed0120" + key)
         self.execute()
@@ -166,7 +166,7 @@ def asset(self, asset_definition=None, account=None, value_of_value_type=None):
         :return: The current ClientCli object.
         :rtype: ClientCli
         """
-        self.command.insert(3, "asset")
+        self.command.insert(2, "asset")
         if asset_definition and account and value_of_value_type:
             self.command.append(
                 "--asset-id="

client_cli/pytests/src/client_cli/configuration.py

@@ -39,6 +39,10 @@ def load(self, path_config_client_cli):
         """
         if not os.path.exists(path_config_client_cli):
             raise IOError(f"No config file found at {path_config_client_cli}")
+
+        if not os.path.isfile(path_config_client_cli):
+            raise IOError(f"The path is not a file: {path_config_client_cli}")
+
         with open(path_config_client_cli, "r", encoding="utf-8") as config_file:
             self._config = tomlkit.load(config_file)
         self.file = path_config_client_cli

client_cli/pytests/src/client_cli/iroha.py

@@ -21,7 +21,7 @@ def _execute_command(self, command_name: str):
         :param command_name: The name of the command to execute.
         :type command_name: str
         """
-        self.command.insert(3, command_name)
+        self.command.insert(2, command_name)
         self.execute()
 
     def should(self, *args, **kwargs):

core/src/queue.rs

@@ -79,7 +79,7 @@ pub enum Error {
     InBlockchain,
     /// User reached maximum number of transactions in the queue
     MaximumTransactionsPerUser,
-    /// The transaction is in the queue
+    /// The transaction is already in the queue
     IsInQueue,
     /// Failure during signature condition execution
     SignatureCondition,
@@ -513,7 +513,7 @@ mod tests {
             AcceptedTransaction::accept(signed_tx, &chain_id, &tx_limits)
                 .expect("Failed to accept Transaction.")
         };
-        // Check that fully signed transaction pass signature check
+        // Check that fully signed transaction passes signature check
         assert!(matches!(
             fully_signed_tx.check_signature_condition(&wsv),
             MustUse(true)
@@ -525,7 +525,7 @@ mod tests {
         };
         for key_pair in key_pairs {
             let partially_signed_tx: AcceptedTransaction = get_tx(key_pair);
-            // Check that none of partially signed txs does not pass signature check
+            // Check that none of partially signed txs passes signature check
             assert_eq!(
                 partially_signed_tx.check_signature_condition(&wsv),
                 MustUse(false)
@@ -535,20 +535,6 @@ mod tests {
                 Error::SignatureCondition
             ))
         }
-        /*
-               // Check that transactions combined into one instead of duplicating
-               assert_eq!(queue.tx_len(), 1);
-
-               let mut available = queue.collect_transactions_for_block(&wsv, max_txs_in_block);
-               assert_eq!(available.len(), 1);
-               let tx_from_queue = available.pop().expect("Checked that have one transactions");
-               // Check that transaction from queue pass signature check
-               assert!(matches!(
-                   tx_from_queue.check_signature_condition(&wsv),
-                   MustUse(true)
-               ));
-
-        */
     }
 
     #[test]