@@ -306,15 +306,10 @@ async fn test_send_vault_success() {
306306 let ( cosmos_address, cosmos_provider) = ctx. src . get_signer ( ) . await ;
307307 let cosmos_address_bytes = cosmos_address. to_string ( ) . into_bytes ( ) ;
308308
309- // ensure_channels_opened(ctx.channel_count).await;
310- // let available_channel = ctx.get_available_channel_count().await;
311- // assert!(available_channel > 0);
312- // let pair = ctx.get_channel().await.expect("channel available");
313-
314- let pair = union_test:: channel_provider:: ChannelPair {
315- src : 1 . try_into ( ) . unwrap ( ) ,
316- dest : 1 . try_into ( ) . unwrap ( ) ,
317- } ;
309+ ensure_channels_opened ( ctx. channel_count ) . await ;
310+ let available_channel = ctx. get_available_channel_count ( ) . await ;
311+ assert ! ( available_channel > 0 ) ;
312+ let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
318313
319314 let dst_channel_id = pair. dest ;
320315 let src_channel_id = pair. src ;
@@ -592,11 +587,6 @@ async fn test_send_packet_from_evm_to_union_and_send_back_unwrap() {
592587 assert ! ( available_channel > 0 ) ;
593588 let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
594589
595- // let pair = union_test::channel_provider::ChannelPair {
596- // src: 9.try_into().unwrap(),
597- // dest: 9.try_into().unwrap(),
598- // };
599-
600590 let dst_chain_id = pair. dest ;
601591 let src_chain_id = pair. src ;
602592
@@ -781,11 +771,6 @@ async fn test_send_packet_from_union_to_evm_get_refund() {
781771 assert ! ( available_channel > 0 ) ;
782772 let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
783773
784- // let pair = union_test::channel_provider::ChannelPair {
785- // src: 1.try_into().unwrap(),
786- // dest: 1.try_into().unwrap(),
787- // };
788-
789774 let dst_chain_id = pair. dest ;
790775 let src_chain_id = pair. src ;
791776
@@ -1061,11 +1046,6 @@ async fn test_stake_from_evm_to_union() {
10611046
10621047 let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
10631048
1064- // let pair = union_test::channel_provider::ChannelPair {
1065- // src: 29.try_into().unwrap(),
1066- // dest: 37.try_into().unwrap(),
1067- // };
1068-
10691049 let img_metadata = ucs03_zkgm:: com:: TokenMetadata {
10701050 implementation : hex ! ( "999709eB04e8A30C7aceD9fd920f7e04EE6B97bA" )
10711051 . to_vec ( )
@@ -1518,10 +1498,6 @@ async fn test_stake_and_unstake_from_evm_to_union() {
15181498 assert ! ( available_channel > 0 ) ;
15191499 let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
15201500
1521- // let pair = union_test::channel_provider::ChannelPair {
1522- // src: 2.try_into().unwrap(),
1523- // dest: 2.try_into().unwrap(),
1524- // };
15251501 let img_metadata = ucs03_zkgm:: com:: TokenMetadata {
15261502 implementation : hex ! ( "999709eB04e8A30C7aceD9fd920f7e04EE6B97bA" )
15271503 . to_vec ( )
@@ -2149,11 +2125,6 @@ async fn test_from_evm_to_union_tokenv2_unhappy_only_maker_err() {
21492125 assert ! ( available_channel > 0 ) ;
21502126 let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
21512127
2152- // let pair = union_test::channel_provider::ChannelPair {
2153- // src: 1.try_into().unwrap(),
2154- // dest: 1.try_into().unwrap(),
2155- // };
2156-
21572128 let img_metadata = ucs03_zkgm:: com:: TokenMetadata {
21582129 implementation : hex ! ( "999709eB04e8A30C7aceD9fd920f7e04EE6B97bA" )
21592130 . to_vec ( )
@@ -2321,11 +2292,6 @@ async fn test_from_evm_to_union_tokenv2_unhappy_errchannelgovernancetokennotset(
23212292 assert ! ( available_channel > 0 ) ;
23222293 let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
23232294
2324- // let pair = union_test::channel_provider::ChannelPair {
2325- // src: 1.try_into().unwrap(),
2326- // dest: 1.try_into().unwrap(),
2327- // };
2328-
23292295 let img_metadata = ucs03_zkgm:: com:: TokenMetadata {
23302296 implementation : hex ! ( "999709eB04e8A30C7aceD9fd920f7e04EE6B97bA" )
23312297 . to_vec ( )
@@ -2346,22 +2312,6 @@ async fn test_from_evm_to_union_tokenv2_unhappy_errchannelgovernancetokennotset(
23462312
23472313 let img = keccak256 ( & img_metadata) ;
23482314 // Not adding governance token by purpose to test the error
2349- // let (_, zkgm_deployer_provider) = ctx.dst.get_provider_privileged().await;
2350- // let governance_token = ctx
2351- // .dst
2352- // .setup_governance_token(
2353- // EVM_ZKGM_BYTES.into(),
2354- // pair.dest,
2355- // img,
2356- // zkgm_deployer_provider,
2357- // )
2358- // .await;
2359-
2360- // assert!(
2361- // governance_token.is_ok(),
2362- // "Failed to setup governance token: {:?}",
2363- // governance_token.err()
2364- // );
23652315
23662316 let mut salt_bytes = [ 0u8 ; 32 ] ;
23672317 rand:: rng ( ) . fill_bytes ( & mut salt_bytes) ;
@@ -2519,11 +2469,6 @@ async fn test_from_evm_to_union_tokenv2_unhappy_erc20_insufficient_balance() {
25192469 assert ! ( available_channel > 0 ) ;
25202470 let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
25212471
2522- // let pair = union_test::channel_provider::ChannelPair {
2523- // src: 1.try_into().unwrap(),
2524- // dest: 1.try_into().unwrap(),
2525- // };
2526-
25272472 let img_metadata = ucs03_zkgm:: com:: TokenMetadata {
25282473 implementation : hex ! ( "999709eB04e8A30C7aceD9fd920f7e04EE6B97bA" )
25292474 . to_vec ( )
@@ -2717,11 +2662,6 @@ async fn test_from_evm_to_union_tokenv2_unhappy_err_invalid_unescrow() {
27172662 assert ! ( available_channel > 0 ) ;
27182663 let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
27192664
2720- // let pair = union_test::channel_provider::ChannelPair {
2721- // src: 1.try_into().unwrap(),
2722- // dest: 1.try_into().unwrap(),
2723- // };
2724-
27252665 let img_metadata = ucs03_zkgm:: com:: TokenMetadata {
27262666 implementation : hex ! ( "999709eB04e8A30C7aceD9fd920f7e04EE6B97bA" )
27272667 . to_vec ( )
@@ -2915,11 +2855,6 @@ async fn test_from_evm_to_union_tokenv2_unhappy_err_cannot_deploy() {
29152855 assert ! ( available_channel > 0 ) ;
29162856 let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
29172857
2918- // let pair = union_test::channel_provider::ChannelPair {
2919- // src: 4.try_into().unwrap(),
2920- // dest: 18.try_into().unwrap(),
2921- // };
2922-
29232858 let img_metadata = ucs03_zkgm:: com:: TokenMetadata {
29242859 implementation : hex ! ( "999709eB04e8A30C7aceD9fd920f7e04EE6B97bA" )
29252860 . to_vec ( )
@@ -3014,15 +2949,10 @@ async fn test_from_evm_to_union_batch_err_invalid_batch_instruction() {
30142949 println ! ( "EVM Address: {:?}" , evm_address) ;
30152950 println ! ( "Cosmos Address: {:?}" , cosmos_address) ;
30162951
3017- // ensure_channels_opened(ctx.channel_count).await;
3018- // let available_channel = ctx.get_available_channel_count().await;
3019- // assert!(available_channel > 0);
3020- // let pair = ctx.get_channel().await.expect("channel available");
3021-
3022- let pair = union_test:: channel_provider:: ChannelPair {
3023- src : 1 . try_into ( ) . unwrap ( ) ,
3024- dest : 1 . try_into ( ) . unwrap ( ) ,
3025- } ;
2952+ ensure_channels_opened ( ctx. channel_count ) . await ;
2953+ let available_channel = ctx. get_available_channel_count ( ) . await ;
2954+ assert ! ( available_channel > 0 ) ;
2955+ let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
30262956
30272957 let dst_chain_id = pair. dest ;
30282958 let _src_chain_id = pair. src ;
@@ -3108,15 +3038,10 @@ async fn test_from_evm_to_union_batch_err_invalid_forward_instruction() {
31083038 println ! ( "EVM Address: {:?}" , evm_address) ;
31093039 println ! ( "Cosmos Address: {:?}" , cosmos_address) ;
31103040
3111- // ensure_channels_opened(ctx.channel_count).await;
3112- // let available_channel = ctx.get_available_channel_count().await;
3113- // assert!(available_channel > 0);
3114- // let pair = ctx.get_channel().await.expect("channel available");
3115-
3116- let pair = union_test:: channel_provider:: ChannelPair {
3117- src : 1 . try_into ( ) . unwrap ( ) ,
3118- dest : 1 . try_into ( ) . unwrap ( ) ,
3119- } ;
3041+ ensure_channels_opened ( ctx. channel_count ) . await ;
3042+ let available_channel = ctx. get_available_channel_count ( ) . await ;
3043+ assert ! ( available_channel > 0 ) ;
3044+ let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
31203045
31213046 let dst_chain_id = pair. dest ;
31223047 let _src_chain_id: u32 = pair. src ;
@@ -3200,15 +3125,10 @@ async fn test_send_vault_unhappy_u_counterparty_is_not_fungible() {
32003125 let ( cosmos_address, cosmos_provider) = ctx. src . get_signer ( ) . await ;
32013126 let cosmos_address_bytes = cosmos_address. to_string ( ) . into_bytes ( ) ;
32023127
3203- // ensure_channels_opened(ctx.channel_count).await;
3204- // let available_channel = ctx.get_available_channel_count().await;
3205- // assert!(available_channel > 0);
3206- // let pair = ctx.get_channel().await.expect("channel available");
3207-
3208- let pair = union_test:: channel_provider:: ChannelPair {
3209- src : 1 . try_into ( ) . unwrap ( ) ,
3210- dest : 1 . try_into ( ) . unwrap ( ) ,
3211- } ;
3128+ ensure_channels_opened ( ctx. channel_count ) . await ;
3129+ let available_channel = ctx. get_available_channel_count ( ) . await ;
3130+ assert ! ( available_channel > 0 ) ;
3131+ let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
32123132
32133133 let dst_channel_id = pair. dest ;
32143134 let src_channel_id = pair. src ;
@@ -3381,15 +3301,10 @@ async fn test_send_vault_unhappy_u_base_amount_must_cover_quote_amount() {
33813301 let ( cosmos_address, cosmos_provider) = ctx. src . get_signer ( ) . await ;
33823302 let cosmos_address_bytes = cosmos_address. to_string ( ) . into_bytes ( ) ;
33833303
3384- // ensure_channels_opened(ctx.channel_count).await;
3385- // let available_channel = ctx.get_available_channel_count().await;
3386- // assert!(available_channel > 0);
3387- // let pair = ctx.get_channel().await.expect("channel available");
3388-
3389- let pair = union_test:: channel_provider:: ChannelPair {
3390- src : 1 . try_into ( ) . unwrap ( ) ,
3391- dest : 1 . try_into ( ) . unwrap ( ) ,
3392- } ;
3304+ ensure_channels_opened ( ctx. channel_count ) . await ;
3305+ let available_channel = ctx. get_available_channel_count ( ) . await ;
3306+ assert ! ( available_channel > 0 ) ;
3307+ let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
33933308
33943309 let dst_channel_id = pair. dest ;
33953310 let src_channel_id = pair. src ;
@@ -3562,15 +3477,10 @@ async fn test_send_vault_unhappy_u_fool() {
35623477 let ( cosmos_address, cosmos_provider) = ctx. src . get_signer ( ) . await ;
35633478 let cosmos_address_bytes = cosmos_address. to_string ( ) . into_bytes ( ) ;
35643479
3565- // ensure_channels_opened(ctx.channel_count).await;
3566- // let available_channel = ctx.get_available_channel_count().await;
3567- // assert!(available_channel > 0);
3568- // let pair = ctx.get_channel().await.expect("channel available");
3569-
3570- let pair = union_test:: channel_provider:: ChannelPair {
3571- src : 1 . try_into ( ) . unwrap ( ) ,
3572- dest : 1 . try_into ( ) . unwrap ( ) ,
3573- } ;
3480+ ensure_channels_opened ( ctx. channel_count ) . await ;
3481+ let available_channel = ctx. get_available_channel_count ( ) . await ;
3482+ assert ! ( available_channel > 0 ) ;
3483+ let pair = ctx. get_channel ( ) . await . expect ( "channel available" ) ;
35743484
35753485 let dst_channel_id = pair. dest ;
35763486 let src_channel_id = pair. src ;
@@ -3758,7 +3668,6 @@ async fn from_evm_to_union_refund() {
37583668
37593669#[ tokio:: test] // Note: For this one to work; timeout plugin should be enabled on voyager.
37603670async fn from_union_to_evm_refund ( ) {
3761- // TODO: Fix it later. Refund is not happening correctly.
37623671 self :: test_send_packet_from_union_to_evm_get_refund ( ) . await ;
37633672}
37643673
0 commit comments