Skip to content

Commit

Permalink
Merge branch 'main' into trinity/fullnode-sync
Browse files Browse the repository at this point in the history
  • Loading branch information
@hoangdv2429
hoangdv2429 committed May 29, 2024
2 parents 990388e + 305bb15 commit ced3941
Show file tree
Hide file tree
Showing 26 changed files with 749 additions and 450 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/e2e-test-workflow-call.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,6 @@ jobs:
DYMENSION_CI: ${{ inputs.dymension_ci }}
ROLLAPP_EVM_CI: ${{ inputs.rollapp_evm_ci }}
ROLLAPP_WASM_CI: ${{ inputs.rollapp_wasm_ci }}
RELAYER_CI: ${{ inputs.relayer_ci }}
RELAYER_CI: ${{ inputs.relayer_ci }}


6 changes: 6 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ e2e-test-rollapp_genesis_transfer_rollapp_to_hub_with_trigger_rollapp_evm: clean
e2e-test-rollapp_genesis_transfer_rollapp_to_hub_with_trigger_hub_evm: clean-e2e
cd tests && go test -timeout=25m -race -v -run TestRollAppTransferHubTriggerGenesis_EVM .

e2e-test-rollapp_genesis_transfer_hub_to_rollapp_with_trigger_rollapp_evm: clean-e2e
cd tests && go test -timeout=25m -race -v -run TestHubTransferRollAppTriggerGenesis_EVM .

e2e-test-rollapp_genesis_transfer_hub_to_rollapp_with_trigger_hub_evm: clean-e2e
cd tests && go test -timeout=25m -race -v -run TestHubTransferHubTriggerGenesis_EVM .

Expand Down Expand Up @@ -258,6 +261,9 @@ e2e-test-rollapp_genesis_transfer_rollapp_to_hub_with_trigger_hub_wasm: clean-e2
e2e-test-rollapp-upgrade-wasm: clean-e2e
cd tests && go test -timeout=25m -race -v -run TestRollapp_Wasm_Upgrade .

e2e-test-rollapp_genesis_transfer_hub_to_rollapp_with_trigger_rollapp_wasm: clean-e2e
cd tests && go test -timeout=25m -race -v -run TestHubTransferRollAppTriggerGenesis_Wasm .

e2e-test-rollapp_genesis_transfer_back_and_forth_with_trigger_both_wasm: clean-e2e
cd tests && go test -timeout=25m -race -v -run TestTransferTriggerGenesisBoth_Wasm .

Expand Down
12 changes: 10 additions & 2 deletions tests/disconnection_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ func TestDisconnection_EVM(t *testing.T) {
dymintTomlOverrides["settlement_gas_prices"] = "0adym"
dymintTomlOverrides["max_idle_time"] = "3s"
dymintTomlOverrides["max_proof_time"] = "500ms"
dymintTomlOverrides["batch_submit_max_time"] = "100s"
dymintTomlOverrides["batch_submit_max_time"] = "5s"
dymintTomlOverrides["block_batch_max_size_bytes"] = "1000"
dymintTomlOverrides["max_supported_batch_skew"] = "1"
dymintTomlOverrides["batch_acceptance_attempts"] = "1"
dymintTomlOverrides["batch_acceptance_timeout"] = "5s"

configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
// Create chain factory with dymension
Expand Down Expand Up @@ -153,7 +157,11 @@ func TestDisconnection_Wasm(t *testing.T) {
dymintTomlOverrides["settlement_gas_prices"] = "0adym"
dymintTomlOverrides["max_idle_time"] = "3s"
dymintTomlOverrides["max_proof_time"] = "500ms"
dymintTomlOverrides["batch_submit_max_time"] = "100s"
dymintTomlOverrides["batch_submit_max_time"] = "5s"
dymintTomlOverrides["block_batch_max_size_bytes"] = "1000"
dymintTomlOverrides["max_supported_batch_skew"] = "1"
dymintTomlOverrides["batch_acceptance_attempts"] = "1"
dymintTomlOverrides["batch_acceptance_timeout"] = "5s"

configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
// Create chain factory with dymension
Expand Down
24 changes: 12 additions & 12 deletions tests/eibc_ack_error_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ func TestEIBC_AckError_Dym_EVM(t *testing.T) {
// Relayer Factory
client, network := test.DockerSetup(t)
r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer1", network)
r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer2", network)

ic := test.NewSetup().
Expand Down Expand Up @@ -503,10 +503,10 @@ func TestEIBC_AckError_RA_Token_EVM(t *testing.T) {
// Relayer Factory
client, network := test.DockerSetup(t)
r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer1", network)
r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer2", network)

ic := test.NewSetup().
Expand Down Expand Up @@ -836,10 +836,10 @@ func TestEIBC_AckError_3rd_Party_Token_EVM(t *testing.T) {
// Relayer Factory
client, network := test.DockerSetup(t)
r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer1", network)
r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer2", network)

ic := test.NewSetup().
Expand Down Expand Up @@ -1202,10 +1202,10 @@ func TestEIBC_AckError_Dym_Wasm(t *testing.T) {
// Relayer Factory
client, network := test.DockerSetup(t)
r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer1", network)
r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer2", network)

ic := test.NewSetup().
Expand Down Expand Up @@ -1559,10 +1559,10 @@ func TestEIBC_AckError_RA_Token_Wasm(t *testing.T) {
// Relayer Factory
client, network := test.DockerSetup(t)
r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer1", network)
r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer2", network)

ic := test.NewSetup().
Expand Down Expand Up @@ -1892,10 +1892,10 @@ func TestEIBC_AckError_3rd_Party_Token_Wasm(t *testing.T) {
// Relayer Factory
client, network := test.DockerSetup(t)
r1 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer1", network)
r2 := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer2", network)

ic := test.NewSetup().
Expand Down
2 changes: 1 addition & 1 deletion tests/eibc_corrupted_memo_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func TestEIBCCorruptedMemoNegative_EVM(t *testing.T) {
// Relayer Factory
client, network := test.DockerSetup(t)
r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer", network)
const ibcPath = "ibc-path"
ic := test.NewSetup().
Expand Down
2 changes: 1 addition & 1 deletion tests/eibc_fee_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func TestEIBCFeeTooHigh_EVM(t *testing.T) {
// Relayer Factory
client, network := test.DockerSetup(t)
r := test.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t),
relayer.CustomDockerImage("ghcr.io/dymensionxyz/go-relayer", "main-dym", "100:1000"),
relayer.CustomDockerImage(RelayerMainRepo, relayerVersion, "100:1000"), relayer.ImagePull(pullRelayerImage),
).Build(t, client, "relayer1", network)
const ibcPath = "ibc-path"
ic := test.NewSetup().
Expand Down
Loading

0 comments on commit ced3941

Please sign in to comment.