From b83d3dccbc97722f44455b4e3733023834e7cb02 Mon Sep 17 00:00:00 2001 From: Adrian Brink Date: Wed, 11 Jan 2023 09:00:12 +0100 Subject: [PATCH 1/2] Rename '--ledger-address' to '--node' It's more common to refer to the cli option that connects to a fullnode as '--node'. --- apps/src/lib/cli.rs | 2 +- documentation/docs/src/user-guide/ibc.md | 8 +- tests/src/e2e/eth_bridge_tests.rs | 2 +- tests/src/e2e/helpers.rs | 6 +- tests/src/e2e/ibc_tests.rs | 18 +-- tests/src/e2e/ledger_tests.rs | 198 +++++++++++------------ 6 files changed, 117 insertions(+), 117 deletions(-) diff --git a/apps/src/lib/cli.rs b/apps/src/lib/cli.rs index 08d6dfe722..6e7131d450 100644 --- a/apps/src/lib/cli.rs +++ b/apps/src/lib/cli.rs @@ -1588,7 +1588,7 @@ pub mod args { TendermintAddress::from_str(raw).unwrap() })); - const LEDGER_ADDRESS: Arg = arg("ledger-address"); + const LEDGER_ADDRESS: Arg = arg("node"); const LOCALHOST: ArgFlag = flag("localhost"); const MASP_VALUE: Arg = arg("value"); const MAX_COMMISSION_RATE_CHANGE: Arg = diff --git a/documentation/docs/src/user-guide/ibc.md b/documentation/docs/src/user-guide/ibc.md index 19e5deace7..b691672606 100644 --- a/documentation/docs/src/user-guide/ibc.md +++ b/documentation/docs/src/user-guide/ibc.md @@ -243,9 +243,9 @@ killall namadan ## Transferring assets over IBC This will make transfers across chains by Namada CLI. This assumes that a channel has been created and Hermes is running with the proper config. -In order to do this by Namada's `ibc-transfer` command, we will need to know the `base-dir` and `ledger-address` of each instance (and other transfer parameters). +In order to do this by Namada's `ibc-transfer` command, we will need to know the `base-dir` and `node` of each instance (and other transfer parameters). `base-dir` is the base directory of each node. If you have used the script, the direcotry is `${IBC_RS}/data/namada-*/.namada`. -`ledger-address` is `rpc_addr` in the relevant hermes' config files. +`node` is `rpc_addr` in the relevant hermes' config files. One can run `grep "rpc_addr" ${HERMES_CONFIG}`. @@ -276,7 +276,7 @@ namadac --base-dir ${BASE_DIR_A} --receiver ${RECEIVER_RAW_ADDRESS} \ --token ${TOKEN_ALIAS} \ --channel-id ${CHANNEL_ID} \ - --ledger-address ${LEDGER_ADDRESS_A} + --node ${LEDGER_ADDRESS_A} ``` Where the above variables in `${VARIABLE}` must be substituted with appropriate values. The raw address of the receiver can be found by `namadaw --base-dir ${BASE_DIR_B} address find --alias ${RECEIVER}`. @@ -290,5 +290,5 @@ namadac --base-dir ${BASE_DIR_A} --receiver atest1d9khqw36g56nqwpkgezrvvejg3p5xv2z8y6nydehxprygvp5g4znj3phxfpyv3pcgcunws2x0wwa76 \ --token nam \ --channel-id channel-0 \ - --ledger-address 127.0.0.1:27657 + --node 127.0.0.1:27657 ``` diff --git a/tests/src/e2e/eth_bridge_tests.rs b/tests/src/e2e/eth_bridge_tests.rs index 7cc1bd6aee..94cf70cdcf 100644 --- a/tests/src/e2e/eth_bridge_tests.rs +++ b/tests/src/e2e/eth_bridge_tests.rs @@ -59,7 +59,7 @@ fn everything() { &tx_code_path, "--data-path", &tx_data_path, - "--ledger-address", + "--node", &ledger_addr, ]; diff --git a/tests/src/e2e/helpers.rs b/tests/src/e2e/helpers.rs index 590b92602b..940f73ca39 100644 --- a/tests/src/e2e/helpers.rs +++ b/tests/src/e2e/helpers.rs @@ -127,7 +127,7 @@ pub fn find_bonded_stake( "bonded-stake", "--validator", alias.as_ref(), - "--ledger-address", + "--node", ledger_address ], Some(10) @@ -151,7 +151,7 @@ pub fn get_epoch(test: &Test, ledger_address: &str) -> Result { let mut find = run!( test, Bin::Client, - &["epoch", "--ledger-address", ledger_address], + &["epoch", "--node", ledger_address], Some(10) )?; let (unread, matched) = find.exp_regex("Last committed epoch: .*")?; @@ -174,7 +174,7 @@ pub fn get_height(test: &Test, ledger_address: &str) -> Result { let mut find = run!( test, Bin::Client, - &["block", "--ledger-address", ledger_address], + &["block", "--node", ledger_address], Some(10) )?; let (unread, matched) = find.exp_regex("Last committed block ID: .*")?; diff --git a/tests/src/e2e/ibc_tests.rs b/tests/src/e2e/ibc_tests.rs index 8151cdaaca..80f677bea5 100644 --- a/tests/src/e2e/ibc_tests.rs +++ b/tests/src/e2e/ibc_tests.rs @@ -774,7 +774,7 @@ fn transfer_received_token( "0", "--gas-token", NAM, - "--ledger-address", + "--node", &rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -1065,7 +1065,7 @@ fn submit_ibc_tx( "0", "--gas-token", NAM, - "--ledger-address", + "--node", &rpc ], Some(40) @@ -1107,7 +1107,7 @@ fn transfer( &channel_id, "--port-id", &port_id, - "--ledger-address", + "--node", &rpc, ]; let sp = sub_prefix.clone().unwrap_or_default(); @@ -1272,7 +1272,7 @@ fn check_balances( // Check the balances on Chain A let rpc_a = get_actor_rpc(test_a, &Who::Validator(0)); let query_args = - vec!["balance", "--token", NAM, "--ledger-address", &rpc_a]; + vec!["balance", "--token", NAM, "--node", &rpc_a]; let mut client = run!(test_a, Bin::Client, query_args, Some(40))?; // Check the source balance let expected = ": 900000, owned by albert".to_string(); @@ -1308,7 +1308,7 @@ fn check_balances( NAM, "--sub-prefix", &sub_prefix, - "--ledger-address", + "--node", &rpc_b, ]; let expected = format!("NAM with {}: 100000", sub_prefix); @@ -1342,7 +1342,7 @@ fn check_balances_after_non_ibc( NAM, "--sub-prefix", &sub_prefix, - "--ledger-address", + "--node", &rpc, ]; let expected = format!("NAM with {}: 50000", sub_prefix); @@ -1359,7 +1359,7 @@ fn check_balances_after_non_ibc( NAM, "--sub-prefix", &sub_prefix, - "--ledger-address", + "--node", &rpc, ]; let expected = format!("NAM with {}: 50000", sub_prefix); @@ -1382,7 +1382,7 @@ fn check_balances_after_back( // Check the balances on Chain A let rpc_a = get_actor_rpc(test_a, &Who::Validator(0)); let query_args = - vec!["balance", "--token", NAM, "--ledger-address", &rpc_a]; + vec!["balance", "--token", NAM, "--node", &rpc_a]; let mut client = run!(test_a, Bin::Client, query_args, Some(40))?; // Check the source balance let expected = ": 950000, owned by albert".to_string(); @@ -1418,7 +1418,7 @@ fn check_balances_after_back( NAM, "--sub-prefix", &sub_prefix, - "--ledger-address", + "--node", &rpc_b, ]; let expected = format!("NAM with {}: 0", sub_prefix); diff --git a/tests/src/e2e/ledger_tests.rs b/tests/src/e2e/ledger_tests.rs index 46e300dab0..31c56f9b1b 100644 --- a/tests/src/e2e/ledger_tests.rs +++ b/tests/src/e2e/ledger_tests.rs @@ -116,7 +116,7 @@ fn test_node_connectivity_and_consensus() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -151,7 +151,7 @@ fn test_node_connectivity_and_consensus() -> Result<()> { ALBERT, "--token", NAM, - "--ledger-address", + "--node", ledger_rpc, ] }; @@ -311,7 +311,7 @@ fn ledger_txs_and_queries() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ], // Submit a token transfer tx (from an implicit account) @@ -331,7 +331,7 @@ fn ledger_txs_and_queries() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ], // 3. Submit a transaction to update an account's validity @@ -348,7 +348,7 @@ fn ledger_txs_and_queries() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ], // 4. Submit a custom tx @@ -366,7 +366,7 @@ fn ledger_txs_and_queries() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], // 5. Submit a tx to initialize a new account @@ -387,7 +387,7 @@ fn ledger_txs_and_queries() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ], // 6. Submit a tx to withdraw from faucet account (requires PoW challenge @@ -405,7 +405,7 @@ fn ledger_txs_and_queries() -> Result<()> { // Faucet withdrawal requires an explicit signer "--signer", ALBERT, - "--ledger-address", + "--node", &validator_one_rpc, ], ]; @@ -437,7 +437,7 @@ fn ledger_txs_and_queries() -> Result<()> { BERTHA, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ], // expect a decimal @@ -462,7 +462,7 @@ fn ledger_txs_and_queries() -> Result<()> { "query-bytes", "--storage-key", &storage_key, - "--ledger-address", + "--node", &validator_one_rpc, ], // expect hex encoded of borsh encoded bytes @@ -541,7 +541,7 @@ fn masp_txs_and_queries() -> Result<()> { BTC, "--amount", "10", - "--ledger-address", + "--node", &validator_one_rpc, ], "No balance found", @@ -558,7 +558,7 @@ fn masp_txs_and_queries() -> Result<()> { BTC, "--amount", "15", - "--ledger-address", + "--node", &validator_one_rpc, ], "No balance found", @@ -575,7 +575,7 @@ fn masp_txs_and_queries() -> Result<()> { BTC, "--amount", "20", - "--ledger-address", + "--node", &validator_one_rpc, ], "Transaction is valid", @@ -594,7 +594,7 @@ fn masp_txs_and_queries() -> Result<()> { "10", "--signer", ALBERT, - "--ledger-address", + "--node", &validator_one_rpc, ], "No balance found", @@ -613,7 +613,7 @@ fn masp_txs_and_queries() -> Result<()> { "7", "--signer", ALBERT, - "--ledger-address", + "--node", &validator_one_rpc, ], "Transaction is valid", @@ -632,7 +632,7 @@ fn masp_txs_and_queries() -> Result<()> { "7", "--signer", ALBERT, - "--ledger-address", + "--node", &validator_one_rpc, ], "Transaction is valid", @@ -651,7 +651,7 @@ fn masp_txs_and_queries() -> Result<()> { "7", "--signer", ALBERT, - "--ledger-address", + "--node", &validator_one_rpc, ], "is lower than the amount to be transferred and fees", @@ -670,7 +670,7 @@ fn masp_txs_and_queries() -> Result<()> { "6", "--signer", ALBERT, - "--ledger-address", + "--node", &validator_one_rpc, ], "Transaction is valid", @@ -683,7 +683,7 @@ fn masp_txs_and_queries() -> Result<()> { AA_VIEWING_KEY, "--token", BTC, - "--ledger-address", + "--node", &validator_one_rpc, ], "No shielded BTC balance found", @@ -696,7 +696,7 @@ fn masp_txs_and_queries() -> Result<()> { AA_VIEWING_KEY, "--token", ETH, - "--ledger-address", + "--node", &validator_one_rpc, ], "No shielded ETH balance found", @@ -707,7 +707,7 @@ fn masp_txs_and_queries() -> Result<()> { "balance", "--owner", AB_VIEWING_KEY, - "--ledger-address", + "--node", &validator_one_rpc, ], "BTC : 20", @@ -726,7 +726,7 @@ fn masp_txs_and_queries() -> Result<()> { "20", "--signer", BERTHA, - "--ledger-address", + "--node", &validator_one_rpc, ], "Transaction is valid", @@ -807,7 +807,7 @@ fn masp_pinned_txs() -> Result<()> { AC_PAYMENT_ADDRESS, "--token", BTC, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -826,7 +826,7 @@ fn masp_pinned_txs() -> Result<()> { AC_PAYMENT_ADDRESS, "--token", BTC, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -849,7 +849,7 @@ fn masp_pinned_txs() -> Result<()> { BTC, "--amount", "20", - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -867,7 +867,7 @@ fn masp_pinned_txs() -> Result<()> { AC_PAYMENT_ADDRESS, "--token", BTC, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -886,7 +886,7 @@ fn masp_pinned_txs() -> Result<()> { AC_PAYMENT_ADDRESS, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -908,7 +908,7 @@ fn masp_pinned_txs() -> Result<()> { AC_PAYMENT_ADDRESS, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -974,7 +974,7 @@ fn masp_incentives() -> Result<()> { BTC, "--amount", "20", - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -992,7 +992,7 @@ fn masp_incentives() -> Result<()> { AA_VIEWING_KEY, "--token", BTC, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1010,7 +1010,7 @@ fn masp_incentives() -> Result<()> { AA_VIEWING_KEY, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1033,7 +1033,7 @@ fn masp_incentives() -> Result<()> { AA_VIEWING_KEY, "--token", BTC, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1054,7 +1054,7 @@ fn masp_incentives() -> Result<()> { AA_VIEWING_KEY, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1075,7 +1075,7 @@ fn masp_incentives() -> Result<()> { MASP, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1099,7 +1099,7 @@ fn masp_incentives() -> Result<()> { AA_VIEWING_KEY, "--token", BTC, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1117,7 +1117,7 @@ fn masp_incentives() -> Result<()> { AA_VIEWING_KEY, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1138,7 +1138,7 @@ fn masp_incentives() -> Result<()> { MASP, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1166,7 +1166,7 @@ fn masp_incentives() -> Result<()> { ETH, "--amount", "30", - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1184,7 +1184,7 @@ fn masp_incentives() -> Result<()> { AB_VIEWING_KEY, "--token", ETH, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1202,7 +1202,7 @@ fn masp_incentives() -> Result<()> { AB_VIEWING_KEY, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1223,7 +1223,7 @@ fn masp_incentives() -> Result<()> { AB_VIEWING_KEY, "--token", ETH, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1241,7 +1241,7 @@ fn masp_incentives() -> Result<()> { AB_VIEWING_KEY, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1263,7 +1263,7 @@ fn masp_incentives() -> Result<()> { MASP, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1294,7 +1294,7 @@ fn masp_incentives() -> Result<()> { "30", "--signer", BERTHA, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1312,7 +1312,7 @@ fn masp_incentives() -> Result<()> { AB_VIEWING_KEY, "--token", ETH, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1332,7 +1332,7 @@ fn masp_incentives() -> Result<()> { AB_VIEWING_KEY, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1355,7 +1355,7 @@ fn masp_incentives() -> Result<()> { MASP, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1386,7 +1386,7 @@ fn masp_incentives() -> Result<()> { "20", "--signer", ALBERT, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1404,7 +1404,7 @@ fn masp_incentives() -> Result<()> { AA_VIEWING_KEY, "--token", BTC, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1422,7 +1422,7 @@ fn masp_incentives() -> Result<()> { AA_VIEWING_KEY, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1444,7 +1444,7 @@ fn masp_incentives() -> Result<()> { MASP, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1469,7 +1469,7 @@ fn masp_incentives() -> Result<()> { AA_VIEWING_KEY, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1490,7 +1490,7 @@ fn masp_incentives() -> Result<()> { AB_VIEWING_KEY, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1512,7 +1512,7 @@ fn masp_incentives() -> Result<()> { MASP, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1544,7 +1544,7 @@ fn masp_incentives() -> Result<()> { &((amt30 * masp_rewards[ð()]).0 * (ep5.0 - ep3.0)).to_string(), "--signer", BERTHA, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1571,7 +1571,7 @@ fn masp_incentives() -> Result<()> { &((amt20 * masp_rewards[&btc()]).0 * (ep6.0 - ep0.0)).to_string(), "--signer", ALBERT, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1589,7 +1589,7 @@ fn masp_incentives() -> Result<()> { AA_VIEWING_KEY, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1607,7 +1607,7 @@ fn masp_incentives() -> Result<()> { AB_VIEWING_KEY, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1625,7 +1625,7 @@ fn masp_incentives() -> Result<()> { MASP, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc ], Some(300) @@ -1692,7 +1692,7 @@ fn invalid_transactions() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -1750,7 +1750,7 @@ fn invalid_transactions() -> Result<()> { // Force to ignore client check that fails on the balance check of the // source address "--force", - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -1823,7 +1823,7 @@ fn pos_bonds() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = @@ -1846,7 +1846,7 @@ fn pos_bonds() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -1866,7 +1866,7 @@ fn pos_bonds() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = @@ -1889,7 +1889,7 @@ fn pos_bonds() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -1929,7 +1929,7 @@ fn pos_bonds() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = @@ -1950,7 +1950,7 @@ fn pos_bonds() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -2023,7 +2023,7 @@ fn pos_init_validator() -> Result<()> { "0.05", "--max-commission-rate-change", "0.01", - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -2048,7 +2048,7 @@ fn pos_init_validator() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -2069,7 +2069,7 @@ fn pos_init_validator() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -2093,7 +2093,7 @@ fn pos_init_validator() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -2113,7 +2113,7 @@ fn pos_init_validator() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -2189,7 +2189,7 @@ fn ledger_many_txs_in_a_block() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", ]); // 2. Spawn threads each submitting token transfer tx @@ -2300,7 +2300,7 @@ fn proposal_submission() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -2316,7 +2316,7 @@ fn proposal_submission() -> Result<()> { "init-proposal", "--data-path", valid_proposal_json_path.to_str().unwrap(), - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, submit_proposal_args, Some(40))?; @@ -2328,7 +2328,7 @@ fn proposal_submission() -> Result<()> { "query-proposal", "--proposal-id", "0", - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2343,7 +2343,7 @@ fn proposal_submission() -> Result<()> { ALBERT, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2358,7 +2358,7 @@ fn proposal_submission() -> Result<()> { GOVERNANCE_ADDRESS, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2414,7 +2414,7 @@ fn proposal_submission() -> Result<()> { "init-proposal", "--data-path", invalid_proposal_json_path.to_str().unwrap(), - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, submit_proposal_args, Some(40))?; @@ -2430,7 +2430,7 @@ fn proposal_submission() -> Result<()> { "query-proposal", "--proposal-id", "1", - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2445,7 +2445,7 @@ fn proposal_submission() -> Result<()> { ALBERT, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2468,7 +2468,7 @@ fn proposal_submission() -> Result<()> { "yay", "--signer", "validator-0", - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2490,7 +2490,7 @@ fn proposal_submission() -> Result<()> { "nay", "--signer", BERTHA, - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2508,7 +2508,7 @@ fn proposal_submission() -> Result<()> { "yay", "--signer", ALBERT, - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2529,7 +2529,7 @@ fn proposal_submission() -> Result<()> { "query-proposal-result", "--proposal-id", "0", - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2550,7 +2550,7 @@ fn proposal_submission() -> Result<()> { ALBERT, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2565,7 +2565,7 @@ fn proposal_submission() -> Result<()> { GOVERNANCE_ADDRESS, "--token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2576,7 +2576,7 @@ fn proposal_submission() -> Result<()> { // // 14. Query parameters let query_protocol_parameters = vec![ "query-protocol-parameters", - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2621,7 +2621,7 @@ fn proposal_offline() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -2663,7 +2663,7 @@ fn proposal_offline() -> Result<()> { "--data-path", valid_proposal_json_path.to_str().unwrap(), "--offline", - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2689,7 +2689,7 @@ fn proposal_offline() -> Result<()> { "--signer", ALBERT, "--offline", - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -2707,7 +2707,7 @@ fn proposal_offline() -> Result<()> { "--data-path", test.test_dir.path().to_str().unwrap(), "--offline", - "--ledger-address", + "--node", &validator_one_rpc, ]; @@ -3071,7 +3071,7 @@ fn test_genesis_validators() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = @@ -3108,7 +3108,7 @@ fn test_genesis_validators() -> Result<()> { validator_1_alias, "--token", NAM, - "--ledger-address", + "--node", ledger_rpc, ] }; @@ -3247,7 +3247,7 @@ fn double_signing_gets_slashed() -> Result<()> { "0", "--gas-token", NAM, - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, tx_args, Some(40))?; @@ -3298,7 +3298,7 @@ fn implicit_account_reveal_pk() -> Result<()> { NAM, "--amount", "10.1", - "--ledger-address", + "--node", &validator_one_rpc, ] .into_iter() @@ -3315,7 +3315,7 @@ fn implicit_account_reveal_pk() -> Result<()> { source, "--amount", "10.1", - "--ledger-address", + "--node", &validator_one_rpc, ] .into_iter() @@ -3331,7 +3331,7 @@ fn implicit_account_reveal_pk() -> Result<()> { "init-proposal", "--data-path", valid_proposal_json_path.to_str().unwrap(), - "--ledger-address", + "--node", &validator_one_rpc, ] .into_iter() @@ -3366,7 +3366,7 @@ fn implicit_account_reveal_pk() -> Result<()> { NAM, "--amount", "1000", - "--ledger-address", + "--node", &validator_one_rpc, ]; let mut client = run!(test, Bin::Client, credit_args, Some(40))?; From 3482da75a1c8ea497f42efce3cc55aa6df5a5dac Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Mon, 16 Jan 2023 13:23:08 +0100 Subject: [PATCH 2/2] run formatter --- tests/src/e2e/ibc_tests.rs | 6 ++---- tests/src/e2e/ledger_tests.rs | 15 +++------------ 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/tests/src/e2e/ibc_tests.rs b/tests/src/e2e/ibc_tests.rs index 80f677bea5..4b0a618004 100644 --- a/tests/src/e2e/ibc_tests.rs +++ b/tests/src/e2e/ibc_tests.rs @@ -1271,8 +1271,7 @@ fn check_balances( // Check the balances on Chain A let rpc_a = get_actor_rpc(test_a, &Who::Validator(0)); - let query_args = - vec!["balance", "--token", NAM, "--node", &rpc_a]; + let query_args = vec!["balance", "--token", NAM, "--node", &rpc_a]; let mut client = run!(test_a, Bin::Client, query_args, Some(40))?; // Check the source balance let expected = ": 900000, owned by albert".to_string(); @@ -1381,8 +1380,7 @@ fn check_balances_after_back( // Check the balances on Chain A let rpc_a = get_actor_rpc(test_a, &Who::Validator(0)); - let query_args = - vec!["balance", "--token", NAM, "--node", &rpc_a]; + let query_args = vec!["balance", "--token", NAM, "--node", &rpc_a]; let mut client = run!(test_a, Bin::Client, query_args, Some(40))?; // Check the source balance let expected = ": 950000, owned by albert".to_string(); diff --git a/tests/src/e2e/ledger_tests.rs b/tests/src/e2e/ledger_tests.rs index 31c56f9b1b..3a33c1e19e 100644 --- a/tests/src/e2e/ledger_tests.rs +++ b/tests/src/e2e/ledger_tests.rs @@ -146,13 +146,7 @@ fn test_node_connectivity_and_consensus() -> Result<()> { let query_balance_args = |ledger_rpc| { vec![ - "balance", - "--owner", - ALBERT, - "--token", - NAM, - "--node", - ledger_rpc, + "balance", "--owner", ALBERT, "--token", NAM, "--node", ledger_rpc, ] }; for ledger_rpc in &[validator_0_rpc, validator_1_rpc, non_validator_rpc] { @@ -2574,11 +2568,8 @@ fn proposal_submission() -> Result<()> { client.assert_success(); // // 14. Query parameters - let query_protocol_parameters = vec![ - "query-protocol-parameters", - "--node", - &validator_one_rpc, - ]; + let query_protocol_parameters = + vec!["query-protocol-parameters", "--node", &validator_one_rpc]; let mut client = run!(test, Bin::Client, query_protocol_parameters, Some(30))?;