Skip to content

Commit

Permalink
Update integration test protos + dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChristianBorst
ChristianBorst committed Apr 19, 2024
1 parent 5f3e4ae commit 80c60ac
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 8 deletions.
8 changes: 4 additions & 4 deletions integration_tests/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration_tests/test_runner/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ path = "src/bin/main.rs"

[dependencies]

althea_proto = "0.6"
althea_proto = "0.7"
prost = "0.12"
prost-types = "0.12"
bytes = "1"
Expand Down
2 changes: 2 additions & 0 deletions integration_tests/test_runner/src/ibc_utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ pub async fn send_ibc_transfer(
Some("Test Relaying".to_string()),
&[fee_coin],
Some(OPERATION_TIMEOUT),
None,
sender,
)
.await
Expand Down Expand Up @@ -201,6 +202,7 @@ pub async fn send_and_assert_ibc_transfer(
Some("Test Relaying".to_string()),
&[fee_coin],
Some(OPERATION_TIMEOUT),
None,
sender,
)
.await;
Expand Down
5 changes: 5 additions & 0 deletions integration_tests/test_runner/src/tests/erc20_conversion.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ pub async fn erc20_register_and_round_trip_test(
denom: STAKING_TOKEN.clone(),
}],
Some(OPERATION_TIMEOUT),
None,
recvr.ethermint_key,
)
.await;
Expand All @@ -159,6 +160,7 @@ pub async fn erc20_register_and_round_trip_test(
denom: STAKING_TOKEN.clone(),
}],
Some(OPERATION_TIMEOUT),
None,
recvr.ethermint_key,
)
.await;
Expand Down Expand Up @@ -251,6 +253,7 @@ pub async fn erc20_register_and_round_trip_test(
denom: STAKING_TOKEN.clone(),
}],
Some(OPERATION_TIMEOUT),
None,
transfer_recvr.ethermint_key,
)
.await;
Expand Down Expand Up @@ -278,6 +281,7 @@ pub async fn erc20_register_and_round_trip_test(
denom: STAKING_TOKEN.clone(),
}],
Some(OPERATION_TIMEOUT),
None,
transfer_recvr.ethermint_key,
)
.await;
Expand Down Expand Up @@ -410,6 +414,7 @@ pub async fn coin_register_and_round_trip_test(
denom: STAKING_TOKEN.clone(),
}],
Some(OPERATION_TIMEOUT),
None,
recvr.ethermint_key,
)
.await;
Expand Down
2 changes: 2 additions & 0 deletions integration_tests/test_runner/src/tests/ica_host.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ pub async fn register_interchain_account(
None,
&[fee],
Some(OPERATION_TIMEOUT),
None,
owner_key,
)
.await
Expand Down Expand Up @@ -458,6 +459,7 @@ pub async fn send_microtx_via_ica(
None,
&[ctrl_fee],
Some(OPERATION_TIMEOUT),
None,
ica_owner,
)
.await
Expand Down
6 changes: 6 additions & 0 deletions integration_tests/test_runner/src/tests/liquid_accounts.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ pub async fn liquify_account(
payer: None,
granter: None,
},
None,
)
.await?;
contact
Expand Down Expand Up @@ -341,6 +342,7 @@ pub async fn execute_microtxs(
Some(fee_coin.clone()),
destination,
Some(OPERATION_TIMEOUT),
None,
keys[0].validator_key,
)
.await;
Expand Down Expand Up @@ -371,6 +373,7 @@ pub async fn execute_microtxs(
Some(fee_coin.clone()),
destination,
Some(OPERATION_TIMEOUT),
None,
erc20_holders[0].ethermint_key,
)
.await;
Expand Down Expand Up @@ -400,6 +403,7 @@ pub async fn execute_microtxs(
Some(fee_coin.clone()),
destination,
Some(OPERATION_TIMEOUT),
None,
erc20_holders[0].ethermint_key,
)
.await;
Expand Down Expand Up @@ -429,6 +433,7 @@ pub async fn execute_microtxs(
Some(fee_coin.clone()),
destination,
Some(OPERATION_TIMEOUT),
None,
erc20_holders[1].ethermint_key,
)
.await;
Expand Down Expand Up @@ -458,6 +463,7 @@ pub async fn execute_microtxs(
Some(fee_coin.clone()),
destination,
Some(OPERATION_TIMEOUT),
None,
erc20_holders[1].ethermint_key,
)
.await;
Expand Down
25 changes: 23 additions & 2 deletions integration_tests/test_runner/src/tests/lockup.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,14 @@ pub async fn fail_to_send(

let msg_send = create_bank_msg_send(sender, receiver.ethermint_address, amount.clone());
let res = contact
.send_message(&[msg_send], None, &[], Some(OPERATION_TIMEOUT), sender)
.send_message(
&[msg_send],
None,
&[],
Some(OPERATION_TIMEOUT),
None,
sender,
)
.await;
res.expect_err("Successfully sent via bank MsgSend? Should not be possible!");
let msg_multi_send =
Expand All @@ -196,14 +203,22 @@ pub async fn fail_to_send(
None,
&[],
Some(OPERATION_TIMEOUT),
None,
sender,
)
.await;
res.expect_err("Successfully sent via bank MsgMultiSend? Should not be possible!");
let msg_microtx =
create_microtx_msg_microtx(sender, receiver.ethermint_address, amount.clone());
let res = contact
.send_message(&[msg_microtx], None, &[], Some(OPERATION_TIMEOUT), sender)
.send_message(
&[msg_microtx],
None,
&[],
Some(OPERATION_TIMEOUT),
None,
sender,
)
.await;
res.expect_err("Successfully sent via microtx MsgMicrotx? Should not be possible!");
let msg_send_authorized = authorized_users[0];
Expand All @@ -222,6 +237,7 @@ pub async fn fail_to_send(
None,
&[],
Some(OPERATION_TIMEOUT),
None,
msg_send_authorized.ethermint_key,
)
.await;
Expand All @@ -242,6 +258,7 @@ pub async fn fail_to_send(
None,
&[],
Some(OPERATION_TIMEOUT),
None,
msg_multi_send_authorized.ethermint_key,
)
.await;
Expand All @@ -262,6 +279,7 @@ pub async fn fail_to_send(
None,
&[],
Some(OPERATION_TIMEOUT),
None,
msg_microtx_authorized.ethermint_key,
)
.await;
Expand Down Expand Up @@ -335,6 +353,7 @@ pub async fn create_authz_bank_msg_send(
None,
&[],
Some(OPERATION_TIMEOUT),
None,
sender.clone(),
)
.await;
Expand Down Expand Up @@ -373,6 +392,7 @@ pub async fn create_authz_bank_msg_multi_send(
None,
&[],
Some(OPERATION_TIMEOUT),
None,
sender.clone(),
)
.await;
Expand Down Expand Up @@ -411,6 +431,7 @@ pub async fn create_authz_microtx_msg_microtx(
None,
&[],
Some(OPERATION_TIMEOUT),
None,
sender.clone(),
)
.await;
Expand Down
2 changes: 2 additions & 0 deletions integration_tests/test_runner/src/tests/microtx_fees.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ pub async fn microtx_fees_test(contact: &Contact, validator_keys: Vec<ValidatorK
.to_address(&ADDRESS_PREFIX)
.unwrap(),
None,
None,
validator_keys[0].validator_key,
)
.await;
Expand Down Expand Up @@ -176,6 +177,7 @@ pub async fn exec_and_check(
None,
&[zero_fee.clone()],
Some(OPERATION_TIMEOUT),
None,
sender.ethermint_key,
)
.await;
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/test_runner/src/tests/onboarding.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ pub async fn convert_erc20(
};
let msg = Msg::new(MSG_CONVERT_ERC20_TYPE_URL, msg_convert_erc20);
althea_contact
.send_message(&[msg], None, &[], Some(OPERATION_TIMEOUT), sender)
.send_message(&[msg], None, &[], Some(OPERATION_TIMEOUT), None, sender)
.await
}

Expand Down

0 comments on commit 80c60ac

Please sign in to comment.