Skip to content

Commit

Permalink
minor
Browse files Browse the repository at this point in the history
  • Loading branch information
@anhductn2001
anhductn2001 committed Dec 10, 2024
1 parent 550c6c4 commit 1f1f951
Show file tree
Hide file tree
Showing 14 changed files with 501 additions and 118 deletions.
47 changes: 33 additions & 14 deletions tests/automated_denommetadata_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,19 @@ func TestADMC_Hub_to_RA_reserved_EVM(t *testing.T) {
wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
require.True(t, found)

wallet3, found := r3.GetWallet(gaia.Config().ChainID)
require.True(t, found)

keyDir := dymension.GetRollApps()[0].GetSequencerKeyDir()
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress(), wallet2.FormattedAddress(), wallet3.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down Expand Up @@ -494,7 +498,7 @@ func TestADMC_Hub_to_RA_3rd_Party_EVM(t *testing.T) {
}, nil, "", nil, false, 1179360, true)
require.NoError(t, err)

wallet, found := r1.GetWallet(rollapp1.Config().ChainID)
wallet1, found := r1.GetWallet(rollapp1.Config().ChainID)
require.True(t, found)

wallet2, found := r3.GetWallet(gaia.Config().ChainID)
Expand All @@ -504,8 +508,15 @@ func TestADMC_Hub_to_RA_3rd_Party_EVM(t *testing.T) {
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet.FormattedAddress(), wallet2.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down Expand Up @@ -825,15 +836,19 @@ func TestADMC_Hub_to_RA_reserved_Wasm(t *testing.T) {
wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
require.True(t, found)

wallet3, found := r3.GetWallet(gaia.Config().ChainID)
require.True(t, found)

keyDir := dymension.GetRollApps()[0].GetSequencerKeyDir()
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress(), wallet2.FormattedAddress(), wallet3.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down Expand Up @@ -1181,15 +1196,19 @@ func TestADMC_Hub_to_RA_3rd_Party_Wasm(t *testing.T) {
wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
require.True(t, found)

wallet3, found := r3.GetWallet(gaia.Config().ChainID)
require.True(t, found)

keyDir := dymension.GetRollApps()[0].GetSequencerKeyDir()
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress(), wallet2.FormattedAddress(), wallet3.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down
11 changes: 9 additions & 2 deletions tests/bridging_fee_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ func TestChangeBridgeFeeParam_EVM(t *testing.T) {
}, nil, "", nil, false, 1179360, true)
require.NoError(t, err)

wallet, found := r1.GetWallet(rollapp1.Config().ChainID)
wallet1, found := r1.GetWallet(rollapp1.Config().ChainID)
require.True(t, found)

wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
Expand All @@ -321,8 +321,15 @@ func TestChangeBridgeFeeParam_EVM(t *testing.T) {
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet.FormattedAddress(), wallet2.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down
66 changes: 54 additions & 12 deletions tests/eibc_ack_error_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func TestEIBC_AckError_Dym_EVM(t *testing.T) {
}, nil, "", nil, false, 1179360, true)
require.NoError(t, err)

wallet, found := r1.GetWallet(rollapp1.Config().ChainID)
wallet1, found := r1.GetWallet(rollapp1.Config().ChainID)
require.True(t, found)

wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
Expand All @@ -183,8 +183,15 @@ func TestEIBC_AckError_Dym_EVM(t *testing.T) {
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet.FormattedAddress(), wallet2.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down Expand Up @@ -672,7 +679,7 @@ func TestEIBC_AckError_RA_Token_EVM(t *testing.T) {
}, nil, "", nil, false, 1179360, true)
require.NoError(t, err)

wallet, found := r1.GetWallet(rollapp1.Config().ChainID)
wallet1, found := r1.GetWallet(rollapp1.Config().ChainID)
require.True(t, found)

wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
Expand All @@ -682,8 +689,15 @@ func TestEIBC_AckError_RA_Token_EVM(t *testing.T) {
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet.FormattedAddress(), wallet2.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down Expand Up @@ -1146,7 +1160,7 @@ func TestEIBC_AckError_3rd_Party_Token_EVM(t *testing.T) {
}, nil, "", nil, false, 1179360, true)
require.NoError(t, err)

wallet, found := r1.GetWallet(rollapp1.Config().ChainID)
wallet1, found := r1.GetWallet(rollapp1.Config().ChainID)
require.True(t, found)

wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
Expand All @@ -1156,8 +1170,15 @@ func TestEIBC_AckError_3rd_Party_Token_EVM(t *testing.T) {
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet.FormattedAddress(), wallet2.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down Expand Up @@ -1693,7 +1714,7 @@ func TestEIBC_AckError_Dym_Wasm(t *testing.T) {
}, nil, "", nil, false, 1179360, true)
require.NoError(t, err)

wallet, found := r1.GetWallet(rollapp1.Config().ChainID)
wallet1, found := r1.GetWallet(rollapp1.Config().ChainID)
require.True(t, found)

wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
Expand All @@ -1703,8 +1724,15 @@ func TestEIBC_AckError_Dym_Wasm(t *testing.T) {
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet.FormattedAddress(), wallet2.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down Expand Up @@ -2184,7 +2212,7 @@ func TestEIBC_AckError_RA_Token_Wasm(t *testing.T) {
}, nil, "", nil, false, 1179360, true)
require.NoError(t, err)

wallet, found := r1.GetWallet(rollapp1.Config().ChainID)
wallet1, found := r1.GetWallet(rollapp1.Config().ChainID)
require.True(t, found)

wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
Expand All @@ -2194,8 +2222,15 @@ func TestEIBC_AckError_RA_Token_Wasm(t *testing.T) {
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet.FormattedAddress(), wallet2.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down Expand Up @@ -2656,7 +2691,7 @@ func TestEIBC_AckError_3rd_Party_Token_Wasm(t *testing.T) {
}, nil, "", nil, false, 1179360, true)
require.NoError(t, err)

wallet, found := r1.GetWallet(rollapp1.Config().ChainID)
wallet1, found := r1.GetWallet(rollapp1.Config().ChainID)
require.True(t, found)

wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
Expand All @@ -2666,8 +2701,15 @@ func TestEIBC_AckError_3rd_Party_Token_Wasm(t *testing.T) {
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet.FormattedAddress(), wallet2.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down
44 changes: 36 additions & 8 deletions tests/eibc_fee_market_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func TestEIBCFulfillAlreadyFulfilledDemand_EVM(t *testing.T) {
}, nil, "", nil, false, 1179360, true)
require.NoError(t, err)

wallet, found := r1.GetWallet(rollapp1.Config().ChainID)
wallet1, found := r1.GetWallet(rollapp1.Config().ChainID)
require.True(t, found)

wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
Expand All @@ -165,8 +165,15 @@ func TestEIBCFulfillAlreadyFulfilledDemand_EVM(t *testing.T) {
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet.FormattedAddress(), wallet2.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down Expand Up @@ -542,7 +549,7 @@ func TestEIBCAlreadyFulfilledDemand_Wasm(t *testing.T) {
}, nil, "", nil, false, 1179360, true)
require.NoError(t, err)

wallet, found := r1.GetWallet(rollapp1.Config().ChainID)
wallet1, found := r1.GetWallet(rollapp1.Config().ChainID)
require.True(t, found)

wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
Expand All @@ -552,8 +559,15 @@ func TestEIBCAlreadyFulfilledDemand_Wasm(t *testing.T) {
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet.FormattedAddress(), wallet2.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down Expand Up @@ -929,7 +943,7 @@ func TestEIBCUnallowedSigner_EVM(t *testing.T) {
}, nil, "", nil, false, 1179360, true)
require.NoError(t, err)

wallet, found := r1.GetWallet(rollapp1.Config().ChainID)
wallet1, found := r1.GetWallet(rollapp1.Config().ChainID)
require.True(t, found)

wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
Expand All @@ -939,8 +953,15 @@ func TestEIBCUnallowedSigner_EVM(t *testing.T) {
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet.FormattedAddress(), wallet2.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down Expand Up @@ -1224,7 +1245,7 @@ func TestEIBCUnallowedSigner_Wasm(t *testing.T) {
}, nil, "", nil, false, 1179360, true)
require.NoError(t, err)

wallet, found := r1.GetWallet(rollapp1.Config().ChainID)
wallet1, found := r1.GetWallet(rollapp1.Config().ChainID)
require.True(t, found)

wallet2, found := r2.GetWallet(rollapp2.Config().ChainID)
Expand All @@ -1234,8 +1255,15 @@ func TestEIBCUnallowedSigner_Wasm(t *testing.T) {
require.NoError(t, err)
keyPath := keyDir + "/sequencer_keys"

keyDir2 := dymension.GetRollApps()[1].GetSequencerKeyDir()
require.NoError(t, err)
keyPath2 := keyDir2 + "/sequencer_keys"

//Update white listed relayers
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet.FormattedAddress(), wallet2.FormattedAddress()})
_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath, []string{wallet1.FormattedAddress()})
require.NoError(t, err)

_, err = dymension.GetNode().UpdateWhitelistedRelayers(ctx, "sequencer", keyPath2, []string{wallet2.FormattedAddress()})
require.NoError(t, err)

CreateChannel(ctx, t, r1, eRep, dymension.CosmosChain, rollapp1.CosmosChain, ibcPath)
Expand Down
Loading

0 comments on commit 1f1f951

Please sign in to comment.