From 90e21f59cda309c959c5ba7f5d88177c9523dc9c Mon Sep 17 00:00:00 2001 From: Stanimal Date: Mon, 18 Oct 2021 20:49:04 +0400 Subject: [PATCH] Updated fees in cucumber tests --- integration_tests/features/Mempool.feature | 42 +++++++++---------- integration_tests/features/Reorgs.feature | 12 +++--- .../features/TransactionInfo.feature | 2 +- integration_tests/features/WalletFFI.feature | 10 ++--- .../features/WalletMonitoring.feature | 4 +- .../features/WalletRecovery.feature | 10 ++--- .../features/WalletRoutingMechanism.feature | 2 +- .../features/WalletTransactions.feature | 42 +++++++++---------- .../features/WalletTransfer.feature | 4 +- .../features/support/ffi_steps.js | 6 +-- 10 files changed, 67 insertions(+), 67 deletions(-) diff --git a/integration_tests/features/Mempool.feature b/integration_tests/features/Mempool.feature index 2365be2ae8..92df079d7c 100644 --- a/integration_tests/features/Mempool.feature +++ b/integration_tests/features/Mempool.feature @@ -43,9 +43,9 @@ Feature: Mempool When I mine a block on SENDER with coinbase CB2 When I mine a block on SENDER with coinbase CB3 When I mine 4 blocks on SENDER - When I create a custom fee transaction TX1 spending CB1 to UTX1 with fee 80 - When I create a custom fee transaction TX2 spending CB2 to UTX2 with fee 100 - When I create a custom fee transaction TX3 spending CB3 to UTX3 with fee 90 + When I create a custom fee transaction TX1 spending CB1 to UTX1 with fee 16 + When I create a custom fee transaction TX2 spending CB2 to UTX2 with fee 20 + When I create a custom fee transaction TX3 spending CB3 to UTX3 with fee 18 When I submit transaction TX1 to SENDER When I submit transaction TX2 to SENDER When I submit transaction TX3 to SENDER @@ -68,8 +68,8 @@ Feature: Mempool And I have a base node SENDER connected to all seed nodes When I mine a block on SENDER with coinbase CB1 When I mine 4 blocks on SENDER - When I create a custom fee transaction TX1 spending CB1 to UTX1 with fee 80 - When I create a custom fee transaction TX2 spending CB1 to UTX2 with fee 100 + When I create a custom fee transaction TX1 spending CB1 to UTX1 with fee 16 + When I create a custom fee transaction TX2 spending CB1 to UTX2 with fee 20 When I submit transaction TX1 to SENDER When I submit transaction TX2 to SENDER Then SENDER has TX1 in MEMPOOL state @@ -85,8 +85,8 @@ Feature: Mempool And I have a base node SENDER connected to all seed nodes When I mine a block on SENDER with coinbase CB1 When I mine 4 blocks on SENDER - When I create a custom fee transaction TX1 spending CB1 to UTX1 with fee 80 - When I create a custom fee transaction TX2 spending CB1 to UTX2 with fee 100 + When I create a custom fee transaction TX1 spending CB1 to UTX1 with fee 16 + When I create a custom fee transaction TX2 spending CB1 to UTX2 with fee 20 When I submit transaction TX1 to SENDER When I submit transaction TX2 to SENDER Then SENDER has TX1 in MEMPOOL state @@ -106,8 +106,8 @@ Feature: Mempool And I have a base node NODE_B connected to seed SEED_B When I mine a block on NODE_B with coinbase CB_B When I mine 10 blocks on NODE_B - When I create a custom fee transaction TXA spending CB_A to UTX1 with fee 80 - When I create a custom fee transaction TXB spending CB_B to UTX1 with fee 80 + When I create a custom fee transaction TXA spending CB_A to UTX1 with fee 16 + When I create a custom fee transaction TXB spending CB_B to UTX1 with fee 16 When I submit transaction TXA to NODE_A When I submit transaction TXB to NODE_B Then NODE_A has TXA in MEMPOOL state @@ -126,12 +126,12 @@ Feature: Mempool When I mine a block on SENDER with coinbase CB1 When I mine a block on SENDER with coinbase CB2 When I mine 4 blocks on SENDER - When I create a custom fee transaction TX01 spending CB1 to UTX01 with fee 100 - When I create a custom fee transaction TX02 spending UTX01 to UTX02 with fee 100 - When I create a custom fee transaction TX03 spending UTX02 to UTX03 with fee 100 - When I create a custom fee transaction TX11 spending CB2 to UTX11 with fee 100 - When I create a custom fee transaction TX12 spending UTX11 to UTX12 with fee 100 - When I create a custom fee transaction TX13 spending UTX12 to UTX13 with fee 100 + When I create a custom fee transaction TX01 spending CB1 to UTX01 with fee 20 + When I create a custom fee transaction TX02 spending UTX01 to UTX02 with fee 20 + When I create a custom fee transaction TX03 spending UTX02 to UTX03 with fee 20 + When I create a custom fee transaction TX11 spending CB2 to UTX11 with fee 20 + When I create a custom fee transaction TX12 spending UTX11 to UTX12 with fee 20 + When I create a custom fee transaction TX13 spending UTX12 to UTX13 with fee 20 When I submit transaction TX01 to SENDER When I submit transaction TX02 to SENDER When I submit transaction TX03 to SENDER @@ -157,11 +157,11 @@ Feature: Mempool And I have a base node BN1 connected to all seed nodes When I mine a block on BN1 with coinbase CB1 When I mine 5 blocks on BN1 - When I create a custom fee transaction TX1 spending CB1 to UTX1 with fee 80 - When I create a custom fee transaction TX2 spending CB1 to UTX1 with fee 80 - When I create a custom fee transaction TX3 spending CB1 to UTX1 with fee 80 - When I create a custom fee transaction TX4 spending CB1 to UTX1 with fee 80 - When I create a custom fee transaction TX5 spending CB1 to UTX1 with fee 80 + When I create a custom fee transaction TX1 spending CB1 to UTX1 with fee 16 + When I create a custom fee transaction TX2 spending CB1 to UTX1 with fee 16 + When I create a custom fee transaction TX3 spending CB1 to UTX1 with fee 16 + When I create a custom fee transaction TX4 spending CB1 to UTX1 with fee 16 + When I create a custom fee transaction TX5 spending CB1 to UTX1 with fee 16 When I submit transaction TX1 to BN1 When I submit transaction TX2 to BN1 When I submit transaction TX3 to BN1 @@ -174,7 +174,7 @@ Feature: Mempool And I have a base node BN1 connected to all seed nodes When I mine a block on BN1 with coinbase CB1 When I mine 2 blocks on BN1 - When I create a custom fee transaction TX1 spending CB1 to UTX1 with fee 80 + When I create a custom fee transaction TX1 spending CB1 to UTX1 with fee 16 When I submit transaction TX1 to BN1 Then I wait until base node BN1 has 1 unconfirmed transactions in its mempool When I mine 1 blocks on BN1 diff --git a/integration_tests/features/Reorgs.feature b/integration_tests/features/Reorgs.feature index 34338bc6d2..f5527f92f5 100644 --- a/integration_tests/features/Reorgs.feature +++ b/integration_tests/features/Reorgs.feature @@ -101,8 +101,8 @@ Feature: Reorgs When I mine 14 blocks on NODE1 When I mine a block on NODE1 with coinbase CB1 When I mine 4 blocks on NODE1 - When I create a custom fee transaction TX1 spending CB1 to UTX1 with fee 100 - When I create a custom fee transaction TX11 spending UTX1 to UTX11 with fee 100 + When I create a custom fee transaction TX1 spending CB1 to UTX1 with fee 20 + When I create a custom fee transaction TX11 spending UTX1 to UTX11 with fee 20 When I submit transaction TX1 to NODE1 When I submit transaction TX11 to NODE1 When I mine 1 blocks on NODE1 @@ -113,8 +113,8 @@ Feature: Reorgs And node NODE2 is at height 20 When I mine a block on NODE2 with coinbase CB2 When I mine 3 blocks on NODE2 - When I create a custom fee transaction TX2 spending CB2 to UTX2 with fee 100 - When I create a custom fee transaction TX21 spending UTX2 to UTX21 with fee 100 + When I create a custom fee transaction TX2 spending CB2 to UTX2 with fee 20 + When I create a custom fee transaction TX21 spending UTX2 to UTX21 with fee 20 When I submit transaction TX2 to NODE2 When I submit transaction TX21 to NODE2 When I mine 1 blocks on NODE2 @@ -126,8 +126,8 @@ Feature: Reorgs And node NODE1 is at height 20 When I mine a block on NODE1 with coinbase CB3 When I mine 3 blocks on NODE1 - When I create a custom fee transaction TX3 spending CB3 to UTX3 with fee 100 - When I create a custom fee transaction TX31 spending UTX3 to UTX31 with fee 100 + When I create a custom fee transaction TX3 spending CB3 to UTX3 with fee 20 + When I create a custom fee transaction TX31 spending UTX3 to UTX31 with fee 20 When I submit transaction TX3 to NODE1 When I submit transaction TX31 to NODE1 When I mine 1 blocks on NODE1 diff --git a/integration_tests/features/TransactionInfo.feature b/integration_tests/features/TransactionInfo.feature index c7d00db5ec..13bf015b30 100644 --- a/integration_tests/features/TransactionInfo.feature +++ b/integration_tests/features/TransactionInfo.feature @@ -14,7 +14,7 @@ Scenario: Get Transaction Info Then all nodes are at height 4 Then I list all COINBASE transactions for wallet WALLET_A When I wait for wallet WALLET_A to have at least 1002000 uT - And I send 1000000 uT from wallet WALLET_A to wallet WALLET_B at fee 100 + And I send 1000000 uT from wallet WALLET_A to wallet WALLET_B at fee 20 Then wallet WALLET_A detects all transactions are at least Pending Then wallet WALLET_B detects all transactions are at least Pending Then wallet WALLET_A detects all transactions are at least Completed diff --git a/integration_tests/features/WalletFFI.feature b/integration_tests/features/WalletFFI.feature index 9248974871..0988fe2c93 100644 --- a/integration_tests/features/WalletFFI.feature +++ b/integration_tests/features/WalletFFI.feature @@ -53,13 +53,13 @@ Feature: Wallet FFI And mining node MINER mines 10 blocks Then I wait for wallet SENDER to have at least 1000000 uT And I have a ffi wallet FFI_WALLET connected to base node BASE - And I send 2000000 uT from wallet SENDER to wallet FFI_WALLET at fee 100 + And I send 2000000 uT from wallet SENDER to wallet FFI_WALLET at fee 20 And wallet SENDER detects all transactions are at least Broadcast And mining node MINER mines 10 blocks Then I wait for ffi wallet FFI_WALLET to have at least 1000000 uT And I have wallet RECEIVER connected to base node BASE And I stop wallet RECEIVER - And I send 1000000 uT from ffi wallet FFI_WALLET to wallet RECEIVER at fee 100 + And I send 1000000 uT from ffi wallet FFI_WALLET to wallet RECEIVER at fee 20 Then I wait for ffi wallet FFI_WALLET to have 1 pending outbound transaction Then I cancel all outbound transactions on ffi wallet FFI_WALLET and it will cancel 1 transaction And I stop ffi wallet FFI_WALLET @@ -84,11 +84,11 @@ Feature: Wallet FFI And mining node MINER mines 10 blocks Then I wait for wallet SENDER to have at least 1000000 uT And I have a ffi wallet FFI_WALLET connected to base node BASE - And I send 2000000 uT from wallet SENDER to wallet FFI_WALLET at fee 100 + And I send 2000000 uT from wallet SENDER to wallet FFI_WALLET at fee 20 And mining node MINER mines 10 blocks Then I wait for ffi wallet FFI_WALLET to have at least 1000000 uT And I have wallet RECEIVER connected to base node BASE - And I send 1000000 uT from ffi wallet FFI_WALLET to wallet RECEIVER at fee 100 + And I send 1000000 uT from ffi wallet FFI_WALLET to wallet RECEIVER at fee 20 And mining node MINER mines 10 blocks Then I wait for wallet RECEIVER to have at least 1000000 uT And I have 1 received and 1 send transaction in ffi wallet FFI_WALLET @@ -107,7 +107,7 @@ Feature: Wallet FFI And I have a ffi wallet FFI_WALLET connected to base node BASE And I stop ffi wallet FFI_WALLET And I wait 10 seconds - And I send 2000000 uT from wallet SENDER to wallet FFI_WALLET at fee 100 + And I send 2000000 uT from wallet SENDER to wallet FFI_WALLET at fee 20 And I wait 5 seconds # Broken step with reason base node is not persisted # Log: diff --git a/integration_tests/features/WalletMonitoring.feature b/integration_tests/features/WalletMonitoring.feature index 48c664fd34..7d9120755f 100644 --- a/integration_tests/features/WalletMonitoring.feature +++ b/integration_tests/features/WalletMonitoring.feature @@ -66,7 +66,7 @@ Feature: Wallet Monitoring Then node NODE_A1 is at height 10 Then wallet WALLET_A1 detects at least 7 coinbase transactions as Mined_Confirmed # Use 7 of the 10 coinbase UTXOs in transactions (others require 3 confirmations) - And I multi-send 7 transactions of 1000000 uT from wallet WALLET_A1 to wallet WALLET_A2 at fee 100 + And I multi-send 7 transactions of 1000000 uT from wallet WALLET_A1 to wallet WALLET_A2 at fee 20 Then wallet WALLET_A1 detects all transactions are at least Broadcast When I mine 100 blocks on SEED_A Then node SEED_A is at height 110 @@ -88,7 +88,7 @@ Feature: Wallet Monitoring Then node NODE_B1 is at height 10 Then wallet WALLET_B1 detects at least 7 coinbase transactions as Mined_Confirmed # Use 7 of the 10 coinbase UTXOs in transactions (others require 3 confirmations) - And I multi-send 7 transactions of 1000000 uT from wallet WALLET_B1 to wallet WALLET_B2 at fee 100 + And I multi-send 7 transactions of 1000000 uT from wallet WALLET_B1 to wallet WALLET_B2 at fee 20 Then wallet WALLET_B1 detects all transactions are at least Broadcast When I mine 100 blocks on SEED_B Then node SEED_B is at height 110 diff --git a/integration_tests/features/WalletRecovery.feature b/integration_tests/features/WalletRecovery.feature index a499661740..17b3a7ffb3 100644 --- a/integration_tests/features/WalletRecovery.feature +++ b/integration_tests/features/WalletRecovery.feature @@ -14,7 +14,7 @@ Feature: Wallet Recovery When I recover wallet WALLET_A into wallet WALLET_B connected to all seed nodes Then wallet WALLET_A and wallet WALLET_B have the same balance And I have wallet WALLET_C connected to all seed nodes - And I send 100000 uT from wallet WALLET_B to wallet WALLET_C at fee 100 + And I send 100000 uT from wallet WALLET_B to wallet WALLET_C at fee 20 Then wallet WALLET_B detects all transactions are at least Broadcast When I mine 5 blocks on NODE Then all nodes are at height 20 @@ -54,19 +54,19 @@ Feature: Wallet Recovery And I have wallet WALLET_B connected to all seed nodes And I stop wallet WALLET_B # Send 2 one-sided payments to WALLET_B so it can spend them in two cases - Then I send a one-sided transaction of 1000000 uT from WALLET_A to WALLET_B at fee 100 - Then I send a one-sided transaction of 1000000 uT from WALLET_A to WALLET_B at fee 100 + Then I send a one-sided transaction of 1000000 uT from WALLET_A to WALLET_B at fee 20 + Then I send a one-sided transaction of 1000000 uT from WALLET_A to WALLET_B at fee 20 When mining node MINER mines 5 blocks Then all nodes are at height 15 When I recover wallet WALLET_B into wallet WALLET_C connected to all seed nodes Then I wait for wallet WALLET_C to have at least 2000000 uT # Send one of the recovered outputs back to Wallet A as a one-sided transactions - Then I send a one-sided transaction of 900000 uT from WALLET_C to WALLET_A at fee 100 + Then I send a one-sided transaction of 900000 uT from WALLET_C to WALLET_A at fee 20 When mining node MINER mines 5 blocks Then all nodes are at height 20 Then I wait for wallet WALLET_C to have less than 1100000 uT # Send the remaining recovered UTXO to self in standard MW transaction - Then I send 1000000 uT from wallet WALLET_C to wallet WALLET_C at fee 100 + Then I send 1000000 uT from wallet WALLET_C to wallet WALLET_C at fee 20 Then I wait for wallet WALLET_C to have less than 100000 uT When mining node MINER mines 5 blocks Then all nodes are at height 25 diff --git a/integration_tests/features/WalletRoutingMechanism.feature b/integration_tests/features/WalletRoutingMechanism.feature index e93212fb44..b3007d91f9 100644 --- a/integration_tests/features/WalletRoutingMechanism.feature +++ b/integration_tests/features/WalletRoutingMechanism.feature @@ -16,7 +16,7 @@ Scenario Outline: Wallets transacting via specified routing mechanism only When I wait 1 seconds When I wait for wallet WALLET_A to have at least 100000000 uT #When I print the world - And I multi-send 1000000 uT from wallet WALLET_A to all wallets at fee 100 + And I multi-send 1000000 uT from wallet WALLET_A to all wallets at fee 20 Then all wallets detect all transactions are at least Pending Then all wallets detect all transactions are at least Completed Then all wallets detect all transactions are at least Broadcast diff --git a/integration_tests/features/WalletTransactions.feature b/integration_tests/features/WalletTransactions.feature index fc75f4bc1a..51bbc878b0 100644 --- a/integration_tests/features/WalletTransactions.feature +++ b/integration_tests/features/WalletTransactions.feature @@ -11,21 +11,21 @@ Feature: Wallet Transactions Then all nodes are at height 15 When I wait for wallet WALLET_A to have at least 55000000000 uT And I have wallet WALLET_B connected to all seed nodes - Then I send a one-sided transaction of 1000000 uT from WALLET_A to WALLET_B at fee 100 - Then I send a one-sided transaction of 1000000 uT from WALLET_A to WALLET_B at fee 100 + Then I send a one-sided transaction of 1000000 uT from WALLET_A to WALLET_B at fee 20 + Then I send a one-sided transaction of 1000000 uT from WALLET_A to WALLET_B at fee 20 Then wallet WALLET_A detects all transactions are at least Broadcast When mining node MINER mines 5 blocks Then all nodes are at height 20 Then I wait for wallet WALLET_B to have at least 2000000 uT # Spend one of the recovered UTXOs to self in a standard MW transaction - Then I send 900000 uT from wallet WALLET_B to wallet WALLET_B at fee 100 + Then I send 900000 uT from wallet WALLET_B to wallet WALLET_B at fee 20 Then I wait for wallet WALLET_B to have less than 1100000 uT When mining node MINER mines 5 blocks Then all nodes are at height 25 Then I wait for wallet WALLET_B to have at least 1900000 uT # Make a one-sided payment to a new wallet that is big enough to ensure the second recovered output is spent And I have wallet WALLET_C connected to all seed nodes - Then I send a one-sided transaction of 1500000 uT from WALLET_B to WALLET_C at fee 100 + Then I send a one-sided transaction of 1500000 uT from WALLET_B to WALLET_C at fee 20 Then I wait for wallet WALLET_B to have less than 1000000 uT When mining node MINER mines 5 blocks Then all nodes are at height 30 @@ -40,7 +40,7 @@ Feature: Wallet Transactions Then all nodes are at height 5 Then I wait for wallet WALLET_A to have at least 10000000000 uT Then I have wallet WALLET_B connected to all seed nodes - And I send 1000000 uT from wallet WALLET_A to wallet WALLET_B at fee 100 + And I send 1000000 uT from wallet WALLET_A to wallet WALLET_B at fee 20 When wallet WALLET_A detects all transactions are at least Broadcast Then mining node MINER mines 5 blocks Then all nodes are at height 10 @@ -63,12 +63,12 @@ Feature: Wallet Transactions Then all nodes are at height 5 Then I wait for wallet WALLET_A to have at least 10000000000 uT Then I have wallet WALLET_B connected to all seed nodes - And I send 1000000 uT from wallet WALLET_A to wallet WALLET_B at fee 100 + And I send 1000000 uT from wallet WALLET_A to wallet WALLET_B at fee 20 When wallet WALLET_A detects all transactions are at least Broadcast Then mining node MINER mines 5 blocks Then all nodes are at height 10 Then I wait for wallet WALLET_B to have at least 1000000 uT - When I send 900000 uT from wallet WALLET_B to wallet WALLET_A at fee 100 + When I send 900000 uT from wallet WALLET_B to wallet WALLET_A at fee 20 And wallet WALLET_B detects all transactions are at least Broadcast Then mining node MINER mines 5 blocks Then all nodes are at height 15 @@ -94,7 +94,7 @@ Feature: Wallet Transactions And mining node BM mines 4 blocks with min difficulty 1 and max difficulty 50 Then I wait for wallet WB to have at least 1000000 uT And I have wallet WALLET_RECEIVE_TX connected to base node B - And I send 1000000 uT from wallet WB to wallet WALLET_RECEIVE_TX at fee 100 + And I send 1000000 uT from wallet WB to wallet WALLET_RECEIVE_TX at fee 20 And wallet WB detects all transactions are at least Broadcast Then mining node BM mines 4 blocks with min difficulty 50 and max difficulty 100 When node B is at height 8 @@ -138,7 +138,7 @@ Feature: Wallet Transactions Then all nodes are at height 5 Then I wait for wallet WALLET_A to have at least 10000000000 uT When I have wallet WALLET_B connected to all seed nodes - And I send 1000000 uT from wallet WALLET_A to wallet WALLET_B at fee 100 + And I send 1000000 uT from wallet WALLET_A to wallet WALLET_B at fee 20 When I wait 10 seconds When mining node MINER mines 6 blocks Then all nodes are at height 11 @@ -147,7 +147,7 @@ Feature: Wallet Transactions When I have wallet WALLET_C connected to all seed nodes Then I import WALLET_B unspent outputs as faucet outputs to WALLET_C Then I wait for wallet WALLET_C to have at least 1000000 uT - And I send 500000 uT from wallet WALLET_C to wallet WALLET_A at fee 100 + And I send 500000 uT from wallet WALLET_C to wallet WALLET_A at fee 20 When I wait 10 seconds Then wallet WALLET_C detects all transactions are at least Broadcast When mining node MINER mines 6 blocks @@ -163,11 +163,11 @@ Feature: Wallet Transactions Then all nodes are at height 10 Then I wait for wallet WALLET_A to have at least 10000000000 uT Then I have wallet WALLET_B connected to all seed nodes - And I send 100000 uT from wallet WALLET_A to wallet WALLET_B at fee 100 - And I send 100000 uT from wallet WALLET_A to wallet WALLET_B at fee 100 - And I send 100000 uT from wallet WALLET_A to wallet WALLET_B at fee 100 - And I send 100000 uT from wallet WALLET_A to wallet WALLET_B at fee 100 - And I send 100000 uT from wallet WALLET_A to wallet WALLET_B at fee 100 + And I send 100000 uT from wallet WALLET_A to wallet WALLET_B at fee 20 + And I send 100000 uT from wallet WALLET_A to wallet WALLET_B at fee 20 + And I send 100000 uT from wallet WALLET_A to wallet WALLET_B at fee 20 + And I send 100000 uT from wallet WALLET_A to wallet WALLET_B at fee 20 + And I send 100000 uT from wallet WALLET_A to wallet WALLET_B at fee 20 When I wait 30 seconds When wallet WALLET_A detects all transactions are at least Broadcast Then mining node MINER mines 5 blocks @@ -195,7 +195,7 @@ Feature: Wallet Transactions Then wallet WALLET_A1 detects at least 7 coinbase transactions as Mined_Confirmed Then node SEED_A is at height 10 Then node NODE_A1 is at height 10 - And I multi-send 7 transactions of 1000000 uT from wallet WALLET_A1 to wallet WALLET_A2 at fee 100 + And I multi-send 7 transactions of 1000000 uT from wallet WALLET_A1 to wallet WALLET_A2 at fee 20 Then wallet WALLET_A1 detects all transactions are at least Broadcast # # Chain 2: @@ -214,7 +214,7 @@ Feature: Wallet Transactions Then wallet WALLET_B1 detects at least 7 coinbase transactions as Mined_Confirmed Then node SEED_B is at height 12 Then node NODE_B1 is at height 12 - And I multi-send 7 transactions of 1000000 uT from wallet WALLET_B1 to wallet WALLET_B2 at fee 100 + And I multi-send 7 transactions of 1000000 uT from wallet WALLET_B1 to wallet WALLET_B2 at fee 20 Then wallet WALLET_B1 detects all transactions are at least Broadcast # # Connect Chain 1 and 2 in stages @@ -249,7 +249,7 @@ Feature: Wallet Transactions Then wallet WALLET_A1 detects at least 1 coinbase transactions as Mined_Confirmed Then node SEED_A is at height 4 Then node NODE_A1 is at height 4 - And I multi-send 1 transactions of 10000 uT from wallet WALLET_A1 to wallet WALLET_A2 at fee 100 + And I multi-send 1 transactions of 10000 uT from wallet WALLET_A1 to wallet WALLET_A2 at fee 20 Then wallet WALLET_A1 detects all transactions are at least Broadcast # # Chain 2: @@ -268,7 +268,7 @@ Feature: Wallet Transactions Then wallet WALLET_B1 detects at least 2 coinbase transactions as Mined_Confirmed Then node SEED_B is at height 5 Then node NODE_B1 is at height 5 - And I multi-send 2 transactions of 10000 uT from wallet WALLET_B1 to wallet WALLET_B2 at fee 100 + And I multi-send 2 transactions of 10000 uT from wallet WALLET_B1 to wallet WALLET_B2 at fee 20 Then wallet WALLET_B1 detects all transactions are at least Broadcast # # Connect Chain 1 and 2 in stages @@ -295,14 +295,14 @@ Feature: Wallet Transactions Then all nodes are at height 5 Then I wait for wallet WALLET_A to have at least 10000000000 uT And I have non-default wallet WALLET_SENDER connected to all seed nodes using StoreAndForwardOnly - And I send 100000000 uT from wallet WALLET_A to wallet WALLET_SENDER at fee 100 + And I send 100000000 uT from wallet WALLET_A to wallet WALLET_SENDER at fee 20 When wallet WALLET_SENDER detects all transactions are at least Broadcast And mining node MINER mines 5 blocks Then all nodes are at height 10 Then I wait for wallet WALLET_SENDER to have at least 100000000 uT And I have wallet WALLET_RECV connected to all seed nodes And I stop wallet WALLET_RECV - And I send 1000000 uT from wallet WALLET_SENDER to wallet WALLET_RECV at fee 100 + And I send 1000000 uT from wallet WALLET_SENDER to wallet WALLET_RECV at fee 20 When wallet WALLET_SENDER detects last transaction is Pending Then I stop wallet WALLET_SENDER And I start wallet WALLET_RECV diff --git a/integration_tests/features/WalletTransfer.feature b/integration_tests/features/WalletTransfer.feature index 33f8b2b172..1fbade662a 100644 --- a/integration_tests/features/WalletTransfer.feature +++ b/integration_tests/features/WalletTransfer.feature @@ -18,7 +18,7 @@ Feature: Wallet Transfer # Ensure the coinbase lock heights have expired And mining node MINER mines 5 blocks Then all nodes are at height 10 - When I transfer 50000 uT from Wallet_A to Wallet_B and Wallet_C at fee 100 + When I transfer 50000 uT from Wallet_A to Wallet_B and Wallet_C at fee 20 And mining node MINER mines 10 blocks Then all nodes are at height 20 Then all wallets detect all transactions as Mined_Confirmed @@ -34,7 +34,7 @@ Feature: Wallet Transfer Then all nodes are at height 5 # Ensure the coinbase lock heights have expired When I mine 5 blocks on NODE - When I transfer 50000 uT to self from wallet Wallet_A at fee 25 + When I transfer 50000 uT to self from wallet Wallet_A at fee 5 And I mine 5 blocks on NODE Then all nodes are at height 15 Then all wallets detect all transactions as Mined_Confirmed diff --git a/integration_tests/features/support/ffi_steps.js b/integration_tests/features/support/ffi_steps.js index 7a599c9fe7..da58633e7d 100644 --- a/integration_tests/features/support/ffi_steps.js +++ b/integration_tests/features/support/ffi_steps.js @@ -30,13 +30,13 @@ Then( When( "I send {int} uT from ffi wallet {word} to wallet {word} at fee {int}", { timeout: 20 * 1000 }, - function (amount, sender, receiver, fee) { + function (amount, sender, receiver, feePerGram) { let ffi_wallet = this.getWallet(sender); let result = ffi_wallet.sendTransaction( this.getWalletPubkey(receiver), amount, - fee, - `Send from ffi ${sender} to ${receiver} at fee ${fee}` + feePerGram, + `Send from ffi ${sender} to ${receiver} at fee ${feePerGram}` ); console.log(result); }