From 2655357ad8433cfc596146945aa0019a76c44f07 Mon Sep 17 00:00:00 2001 From: Runchao Han Date: Fri, 31 Jan 2025 12:19:50 +1100 Subject: [PATCH] fix e2e --- go.mod | 2 +- go.sum | 4 ++-- itest/container/config.go | 4 +--- itest/opstackl2/op_e2e_test.go | 3 --- itest/opstackl2/op_test_manager.go | 7 +------ itest/test-manager/base_test_manager.go | 2 -- 6 files changed, 5 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index f3890485..9eef7e86 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( cosmossdk.io/errors v1.0.1 cosmossdk.io/math v1.4.0 github.com/avast/retry-go/v4 v4.5.1 - github.com/babylonlabs-io/babylon v1.0.1-rc.0.0.20250128115020-02612f9bc3a2 + github.com/babylonlabs-io/babylon v1.99.0-snapshot.250131 github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20240814002132-55e711397a82 github.com/babylonlabs-io/finality-gadget v0.1.1 github.com/btcsuite/btcd v0.24.2 diff --git a/go.sum b/go.sum index abc58ffa..6ac42cf5 100644 --- a/go.sum +++ b/go.sum @@ -280,8 +280,8 @@ github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX github.com/aws/aws-sdk-go v1.44.312 h1:llrElfzeqG/YOLFFKjg1xNpZCFJ2xraIi3PqSuP+95k= github.com/aws/aws-sdk-go v1.44.312/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/babylonlabs-io/babylon v1.0.1-rc.0.0.20250128115020-02612f9bc3a2 h1:MUpiOtcvAn3HjyVu3g/T9folAkIqGg0yydrfoTZTjHM= -github.com/babylonlabs-io/babylon v1.0.1-rc.0.0.20250128115020-02612f9bc3a2/go.mod h1:NxghSOJHuPCwdIKUsSrmmbVJweTRCLW2tLJ4UjlSwUc= +github.com/babylonlabs-io/babylon v1.99.0-snapshot.250131 h1:sw6c4Rkd2SwtZnLSFyVPMuf8yor/lNTQt17XP2P3AgY= +github.com/babylonlabs-io/babylon v1.99.0-snapshot.250131/go.mod h1:NxghSOJHuPCwdIKUsSrmmbVJweTRCLW2tLJ4UjlSwUc= github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20240814002132-55e711397a82 h1:BwgtEtrrbtwQo4FEsoVqeUIHiqJr5krZt6ds3g1SM4s= github.com/babylonlabs-io/babylon-sdk/demo v0.0.0-20240814002132-55e711397a82/go.mod h1:QqEn1sL4RPG7DJ94XFYvuvEELml64s5XwPQpTayXJss= github.com/babylonlabs-io/babylon-sdk/x v0.0.0-20240814002132-55e711397a82 h1:F9U6iH+RqXo2ColXvGGByWDY0DdyAMnIgjpxQbWooiE= diff --git a/itest/container/config.go b/itest/container/config.go index c95a0329..1e512e54 100644 --- a/itest/container/config.go +++ b/itest/container/config.go @@ -15,16 +15,14 @@ type ImageConfig struct { BabylonVersion string } -//nolint:deadcode const ( - dockerBabylondRepository = "babylonlabs-io/babylond" + dockerBabylondRepository = "babylonlabs/babylond" ) // NewImageConfig returns ImageConfig needed for running e2e test. func NewImageConfig(t *testing.T) ImageConfig { babylondVersion, err := testutil.GetBabylonVersion() require.NoError(t, err) - babylondVersion = "latest" // TODO: change back return ImageConfig{ BabylonRepository: dockerBabylondRepository, BabylonVersion: babylondVersion, diff --git a/itest/opstackl2/op_e2e_test.go b/itest/opstackl2/op_e2e_test.go index 502eea64..901701c1 100644 --- a/itest/opstackl2/op_e2e_test.go +++ b/itest/opstackl2/op_e2e_test.go @@ -19,7 +19,6 @@ import ( // - CommitPubRandList // - QueryLastPublicRandCommit func TestPubRandCommitment(t *testing.T) { - t.Parallel() ctm := StartOpL2ConsumerManager(t) defer ctm.Stop(t) @@ -53,7 +52,6 @@ func TestPubRandCommitment(t *testing.T) { // TestFinalitySigSubmission tests the consumer controller's function: // - SubmitBatchFinalitySigs func TestFinalitySigSubmission(t *testing.T) { - t.Parallel() ctm := StartOpL2ConsumerManager(t) defer ctm.Stop(t) @@ -107,7 +105,6 @@ func TestFinalitySigSubmission(t *testing.T) { // TestFinalityProviderHasPower tests the consumer controller's function: // - QueryFinalityProviderHasPower func TestFinalityProviderHasPower(t *testing.T) { - t.Parallel() ctm := StartOpL2ConsumerManager(t) defer ctm.Stop(t) diff --git a/itest/opstackl2/op_test_manager.go b/itest/opstackl2/op_test_manager.go index 871466e8..39ce23fb 100644 --- a/itest/opstackl2/op_test_manager.go +++ b/itest/opstackl2/op_test_manager.go @@ -31,7 +31,6 @@ import ( "github.com/btcsuite/btcd/btcec/v2" sdkquerytypes "github.com/cosmos/cosmos-sdk/types/query" "github.com/decred/dcrd/dcrec/secp256k1/v4" - "github.com/lightningnetwork/lnd/signal" "github.com/ory/dockertest/v3" "github.com/stretchr/testify/require" "go.uber.org/zap" @@ -113,12 +112,8 @@ func StartOpL2ConsumerManager(t *testing.T) *OpL2ConsumerTestManager { // create Babylon FP config babylonFpCfg := createBabylonFpConfig(t, keyDir, testDir, manager, babylond) - // create shutdown interceptor - shutdownInterceptor, err := signal.Intercept() - require.NoError(t, err) - // create EOTS handler and EOTS gRPC clients for Babylon and consumer - eotsHandler, EOTSClients := base_test_manager.StartEotsManagers(t, logger, testDir, babylonFpCfg, consumerFpCfg, &shutdownInterceptor) + eotsHandler, EOTSClients := base_test_manager.StartEotsManagers(t, logger, testDir, babylonFpCfg, consumerFpCfg) // create Babylon consumer controller babylonConsumerController, err := bbncc.NewBabylonConsumerController(babylonFpCfg.BabylonConfig, &babylonFpCfg.BTCNetParams, logger) diff --git a/itest/test-manager/base_test_manager.go b/itest/test-manager/base_test_manager.go index a874281e..025b3d19 100644 --- a/itest/test-manager/base_test_manager.go +++ b/itest/test-manager/base_test_manager.go @@ -35,7 +35,6 @@ import ( "github.com/btcsuite/btcd/wire" sdk "github.com/cosmos/cosmos-sdk/types" sdkquerytypes "github.com/cosmos/cosmos-sdk/types/query" - "github.com/lightningnetwork/lnd/signal" "github.com/stretchr/testify/require" "go.uber.org/zap" ) @@ -554,7 +553,6 @@ func StartEotsManagers( testDir string, babylonFpCfg *fpcfg.Config, consumerFpCfg *fpcfg.Config, - shutdownInterceptor *signal.Interceptor, ) (*e2eutils.EOTSServerHandler, []*eotsclient.EOTSManagerGRpcClient) { fpCfgs := []*fpcfg.Config{babylonFpCfg, consumerFpCfg} eotsClients := make([]*eotsclient.EOTSManagerGRpcClient, len(fpCfgs))