From b02bb6a28d66e4ad0870483751d203c8c4feb0ef Mon Sep 17 00:00:00 2001 From: yito88 Date: Sat, 11 Nov 2023 10:15:01 +0100 Subject: [PATCH] fixup! Merge branch 'yuji/ibc-rs-0.47.0' (#2084) --- Cargo.lock | 2 +- .../lib/node/ledger/shell/finalize_block.rs | 2 +- benches/native_vps.rs | 8 ++-- benches/txs.rs | 2 +- tests/src/e2e/ibc_tests.rs | 40 +++++++++++-------- wasm/Cargo.lock | 2 +- wasm_for_tests/wasm_source/Cargo.lock | 2 +- 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index be01afa51f..fb694231ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4603,7 +4603,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.38", ] [[package]] diff --git a/apps/src/lib/node/ledger/shell/finalize_block.rs b/apps/src/lib/node/ledger/shell/finalize_block.rs index fc4c9327f4..243c9ab4a4 100644 --- a/apps/src/lib/node/ledger/shell/finalize_block.rs +++ b/apps/src/lib/node/ledger/shell/finalize_block.rs @@ -2174,7 +2174,7 @@ mod test_finalize_block { let pkh1 = get_pkh(validator.address.clone(), Epoch::default()); let votes = vec![VoteInfo { validator: Some(Validator { - address: pkh1.clone(), + address: pkh1.clone().into(), power: u128::try_from(validator.bonded_stake) .expect("Test failed") as i64, }), diff --git a/benches/native_vps.rs b/benches/native_vps.rs index 49904f1915..b3eff8041b 100644 --- a/benches/native_vps.rs +++ b/benches/native_vps.rs @@ -952,7 +952,7 @@ fn ibc_vp_validate_action(c: &mut Criterion) { // Connection handshake let msg = MsgConnectionOpenInit { client_id_on_a: ClientId::new( - ClientType::new("01-tendermint".to_string()).unwrap(), + ClientType::new("01-tendermint").unwrap(), 1, ) .unwrap(), @@ -1033,7 +1033,7 @@ fn ibc_vp_validate_action(c: &mut Criterion) { actions.set_validation_params(ibc.validation_params().unwrap()); let module = TransferModule::new(ctx); - actions.add_transfer_route(module.module_id(), module); + actions.add_transfer_module(module.module_id(), module); group.bench_function(bench_name, |b| { b.iter(|| actions.validate(&tx_data).unwrap()) @@ -1050,7 +1050,7 @@ fn ibc_vp_execute_action(c: &mut Criterion) { // Connection handshake let msg = MsgConnectionOpenInit { client_id_on_a: ClientId::new( - ClientType::new("01-tendermint".to_string()).unwrap(), + ClientType::new("01-tendermint").unwrap(), 1, ) .unwrap(), @@ -1131,7 +1131,7 @@ fn ibc_vp_execute_action(c: &mut Criterion) { actions.set_validation_params(ibc.validation_params().unwrap()); let module = TransferModule::new(ctx); - actions.add_transfer_route(module.module_id(), module); + actions.add_transfer_module(module.module_id(), module); group.bench_function(bench_name, |b| { b.iter(|| actions.execute(&tx_data).unwrap()) diff --git a/benches/txs.rs b/benches/txs.rs index 4947a48c73..85c8df1cdb 100644 --- a/benches/txs.rs +++ b/benches/txs.rs @@ -721,7 +721,7 @@ fn ibc(c: &mut Criterion) { // Connection handshake let msg = MsgConnectionOpenInit { client_id_on_a: ClientId::new( - ClientType::new("01-tendermint".to_string()).unwrap(), + ClientType::new("01-tendermint").unwrap(), 1, ) .unwrap(), diff --git a/tests/src/e2e/ibc_tests.rs b/tests/src/e2e/ibc_tests.rs index e8fc6ef75a..e1b3479d6e 100644 --- a/tests/src/e2e/ibc_tests.rs +++ b/tests/src/e2e/ibc_tests.rs @@ -218,7 +218,7 @@ fn setup_two_single_node_nets() -> Result<(Test, Test)> { // epoch per 100 seconds let update_genesis = |mut genesis: templates::All, base_dir: &_| { - genesis.parameters.parameters.epochs_per_year = 315_360; + genesis.parameters.parameters.epochs_per_year = 31536; setup::set_validators(1, genesis, base_dir, |_| 0) }; let test_a = setup::network(update_genesis, None)?; @@ -1402,16 +1402,19 @@ fn check_balances( ) -> Result<()> { // 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 mut client = run!(test_a, Bin::Client, query_args, Some(40))?; // Check the escrowed balance - let expected = format!( - ": 100000, owned by {}", - Address::Internal(InternalAddress::Ibc) - ); - client.exp_string(&expected)?; + let escrow = Address::Internal(InternalAddress::Ibc).to_string(); + let query_args = vec![ + "balance", "--owner", &escrow, "--token", NAM, "--node", &rpc_a, + ]; + let mut client = run!(test_a, Bin::Client, query_args, Some(40))?; + client.exp_string("nam: 100000")?; // Check the source balance - let expected = ": 880000, owned by albert".to_string(); + let query_args = vec![ + "balance", "--owner", ALBERT, "--token", NAM, "--node", &rpc_a, + ]; + let mut client = run!(test_a, Bin::Client, query_args, Some(40))?; + let expected = "nam: 880000".to_string(); client.exp_string(&expected)?; client.assert_success(); @@ -1466,16 +1469,19 @@ fn check_balances_after_back( ) -> Result<()> { // 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 mut client = run!(test_a, Bin::Client, query_args, Some(40))?; // Check the escrowed balance - let expected = format!( - ": 50000, owned by {}", - Address::Internal(InternalAddress::Ibc) - ); - client.exp_string(&expected)?; + let escrow = Address::Internal(InternalAddress::Ibc).to_string(); + let query_args = vec![ + "balance", "--owner", &escrow, "--token", NAM, "--node", &rpc_a, + ]; + let mut client = run!(test_a, Bin::Client, query_args, Some(40))?; + client.exp_string("nam: 50000")?; // Check the source balance - let expected = ": 930000, owned by albert".to_string(); + let query_args = vec![ + "balance", "--owner", ALBERT, "--token", NAM, "--node", &rpc_a, + ]; + let mut client = run!(test_a, Bin::Client, query_args, Some(40))?; + let expected = "nam: 930000".to_string(); client.exp_string(&expected)?; client.assert_success(); diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index f83e150e4e..08170e1095 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -3697,7 +3697,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.38", ] [[package]] diff --git a/wasm_for_tests/wasm_source/Cargo.lock b/wasm_for_tests/wasm_source/Cargo.lock index df3b5c3534..f3efd192b7 100644 --- a/wasm_for_tests/wasm_source/Cargo.lock +++ b/wasm_for_tests/wasm_source/Cargo.lock @@ -3690,7 +3690,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.38", ] [[package]]