CI fixes

cli/demo_sidechain.sh

@@ -149,7 +149,6 @@ ALICE_EXPECTED_BALANCE=$(( 1 * UNIT ))
 BOB_EXPECTED_BALANCE=$(( 4 * UNIT ))
 
 echo "* Verifying Alice's balance"
-if [ "$ALICE_BALANCE" -ne "$ALICE_EXPECTED_BALANCE" ]; then
 if (( ALICE_BALANCE >= ALICE_EXPECTED_BALANCE ? ALICE_BALANCE - ALICE_EXPECTED_BALANCE > FEE_TOLERANCE : ALICE_EXPECTED_BALANCE - ALICE_BALANCE > FEE_TOLERANCE)); then
   echo "Alice's balance is wrong (expected: $ALICE_EXPECTED_BALANCE, actual: $ALICE_BALANCE), tolerance = $FEE_TOLERANCE"
   exit 1

cli/src/benchmark/mod.rs

@@ -27,7 +27,7 @@ use crate::{
 };
 use codec::Decode;
 use hdrhistogram::Histogram;
-use ita_stf::{Getter, Index, TrustedCall, TrustedCallSigned, TrustedGetter};
+use ita_stf::{Getter, Index, TrustedCall, TrustedCallSigned, TrustedGetter, STF_TX_FEE};
 use itc_rpc_client::direct_client::{DirectApi, DirectClient};
 use itp_stf_primitives::{
 	traits::TrustedCallSigning,
@@ -66,7 +66,7 @@ pub struct BenchmarkCommand {
 
 	/// The number of iterations to execute for each client
 	#[clap(default_value_t = 30)]
-	number_iterations: u32,
+	number_iterations: u128,
 
 	/// Adds a random wait before each transaction. This is the lower bound for the interval in ms.
 	#[clap(default_value_t = 0)]
@@ -138,16 +138,15 @@ impl BenchmarkCommand {
 		println!("Nonce for account {}: {}", self.funding_account, nonce_start);
 
 		let mut accounts = Vec::new();
-
+		let initial_balance = (self.number_iterations + 1) * (STF_TX_FEE + EXISTENTIAL_DEPOSIT);
 		// Setup new accounts and initialize them with money from Alice.
 		for i in 0..self.number_clients {
 			let nonce = i + nonce_start;
-			println!("Initializing account {}", i);
+			println!("Initializing account {} with initial amount {:?}", i, initial_balance);
 
 			// Create new account to use.
 			let a = LocalKeystore::sr25519_generate_new(&store, SR25519_KEY_TYPE, None).unwrap();
 			let account = get_pair_from_str(trusted_args, a.to_string().as_str());
-			let initial_balance = 10000000;
 
 			// Transfer amount from Alice to new account.
 			let top: TrustedOperation<TrustedCallSigned, Getter> = TrustedCall::balance_transfer(
@@ -233,7 +232,7 @@ impl BenchmarkCommand {
 					output.push(result);
 
 					// FIXME: We probably should re-fund the account in this case.
-					if client.current_balance <= EXISTENTIAL_DEPOSIT {
+					if client.current_balance <= EXISTENTIAL_DEPOSIT + STF_TX_FEE {
 						error!("Account {:?} does not have enough balance anymore. Finishing benchmark early", client.account.public());
 						break;
 					}

cli/src/trusted_operation.rs

@@ -390,5 +390,6 @@ fn connection_can_be_closed(top_status: TrustedOperationStatus) -> bool {
 			| TrustedOperationStatus::Future
 			| TrustedOperationStatus::Ready
 			| TrustedOperationStatus::Broadcast
+			| TrustedOperationStatus::Invalid
 	)
 }