kylefang/stacks-subnets
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-subnets.git synced 2026-04-29 12:15:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve issues with register asset events

Browse Source
This commit is contained in:
Brice Dobry
2023-03-14 20:51:42 -04:00
parent 48a1617bb2
commit eb43849c58
5 changed files with 82 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
testnet/stacks-node/src/tests/l1_observer_test.rs
View File

@@ -1001,16 +1001,21 @@ fn l1_deposit_and_withdraw_asset_integration_test() {
serde_json::from_value(contract_event.get("value").unwrap().clone())
.unwrap();
let data_map = value.expect_tuple();
match data_map
.get("type")
.unwrap()
.clone()
.expect_ascii()
.as_str()
{
"ft" | "nft" => Some((height, data_map.clone())),
_ => None,
if let Ok(event_type) = data_map.get("event") {
if event_type.clone().expect_ascii() == "withdraw" {
return match data_map
.get("type")
.unwrap()
.clone()
.expect_ascii()
.as_str()
{
"ft" | "nft" => Some((height, data_map.clone())),
_ => None,
};
}
}
return None;
}
_ => None,
}
@@ -1264,7 +1269,6 @@ fn l1_deposit_and_withdraw_asset_integration_test() {
Value::list_from(nft_sib_data).unwrap(),
],
);
l1_nonce += 1;
// Withdraw ft-token from subnet contract on L1
submit_tx(&l1_rpc_origin, &l1_withdraw_ft_tx);
@@ -1536,10 +1540,14 @@ fn l1_deposit_and_withdraw_stx_integration_test() {
serde_json::from_value(contract_event.get("value").unwrap().clone())
.unwrap();
let data_map = value.expect_tuple();
if data_map.get("type").unwrap().clone().expect_ascii() != "stx" {
return None;
if let Ok(event_type) = data_map.get("event") {
if event_type.clone().expect_ascii() == "withdraw" {
if data_map.get("type").unwrap().clone().expect_ascii() == "stx" {
return Some((height, data_map.clone()));
}
}
}
Some((height, data_map.clone()))
return None;
}
_ => None,
}
@@ -2314,10 +2322,14 @@ fn nft_deposit_and_withdraw_integration_test() {
serde_json::from_value(contract_event.get("value").unwrap().clone())
.unwrap();
let data_map = value.expect_tuple();
if data_map.get("type").unwrap().clone().expect_ascii() != "nft" {
return None;
if let Ok(event_type) = data_map.get("event") {
if event_type.clone().expect_ascii() == "withdraw" {
if data_map.get("type").unwrap().clone().expect_ascii() == "nft" {
return Some((height, data_map.clone()));
}
}
}
Some((height, data_map.clone()))
return None;
}
_ => None,
}
@@ -2865,7 +2877,7 @@ fn ft_deposit_and_withdraw_integration_test() {
l1_nonce += 1;
// deposit 1 ft-token into subnet contract on L1
let tx_res = submit_tx(&l1_rpc_origin, &l1_deposit_ft_tx);
submit_tx(&l1_rpc_origin, &l1_deposit_ft_tx);
// Sleep to give the run loop time to mine a block
wait_for_next_stacks_block(&sortition_db);
@@ -3028,10 +3040,14 @@ fn ft_deposit_and_withdraw_integration_test() {
serde_json::from_value(contract_event.get("value").unwrap().clone())
.unwrap();
let data_map = value.expect_tuple();
if data_map.get("type").unwrap().clone().expect_ascii() != "ft" {
return None;
if let Ok(event_type) = data_map.get("event") {
if event_type.clone().expect_ascii() == "withdraw" {
if data_map.get("type").unwrap().clone().expect_ascii() == "ft" {
return Some((height, data_map.clone()));
}
}
}
Some((height, data_map.clone()))
return None;
}
_ => None,
}

1
testnet/stacks-node/src/tests/l2_withdrawal.rs
View File

@@ -109,7 +109,6 @@ fn withdraw_unregistered_asset() {
"simple-nft",
&nft_content,
);
let nft_contract_name = ContractName::from("simple-nft");
submit_tx(l1_rpc_origin, &nft_publish);