pr comments

babylonlabs-io · Dec 2, 2024 · d8eccac · d8eccac
1 parent a3f6322
commit d8eccac
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 12 deletions.
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -512,7 +512,6 @@ func (ak *AppKeepers) InitKeepers(
 		ak.AccountKeeper,
 		ak.BankKeeper,
 		ak.IBCKeeper.ClientKeeper,
-		ak.IBCKeeper.ChannelKeeper,
 		ak.WasmKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)

diff --git a/contrib/images/ibcsim-bcd/Dockerfile b/contrib/images/ibcsim-bcd/Dockerfile
@@ -18,7 +18,7 @@ ENV PATH $GOPATH/bin:$PATH
 
 ENV GO111MODULE on
 ENV RELAYER_TAG v2.5.2
-ENV BABYLON_SDK_VERSION main
+ENV BABYLON_SDK_VERSION v0.6.0-rc.1
 
 # Install the relayer
 RUN git clone https://github.com/cosmos/relayer.git

diff --git a/test/e2e/btc_staking_integration_e2e_test.go b/test/e2e/btc_staking_integration_e2e_test.go
@@ -420,8 +420,6 @@ func (s *BTCStakingIntegrationTestSuite) Test6ContractQueries() {
 	s.Equal(nodefpDel.MustGetStakingTxHash().String(), contractDelsByFp.StakingTxHashes[0])
 }
 
-// TODO: add test for slashing when its supported in smart contract
-
 // helper function: register a random consumer on Babylon and verify it
 func (s *BTCStakingIntegrationTestSuite) registerVerifyConsumer(babylonNode *chain.NodeConfig, consumerID string) *bsctypes.ConsumerRegister {
 	// Register a random consumer on Babylon

diff --git a/testutil/keeper/btcstaking.go b/testutil/keeper/btcstaking.go
@@ -53,7 +53,6 @@ func BTCStakingKeeperWithStore(
 		nil,
 		nil,
 		nil,
-		nil,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 

diff --git a/testutil/keeper/btcstkconsumer.go b/testutil/keeper/btcstkconsumer.go
@@ -40,7 +40,6 @@ func BTCStkConsumerKeeper(t testing.TB) (keeper.Keeper, sdk.Context) {
 		nil,
 		nil,
 		nil,
-		nil,
 		authority.String(),
 	)
 

diff --git a/x/btcstkconsumer/keeper/keeper.go b/x/btcstkconsumer/keeper/keeper.go
@@ -18,7 +18,6 @@ type Keeper struct {
 	accountKeeper types.AccountKeeper
 	bankKeeper    types.BankKeeper
 	clientKeeper  types.ClientKeeper
-	channelKeeper types.ChannelKeeper
 	wasmKeeper    types.WasmKeeper
 
 	// the address capable of executing a MsgUpdateParams message. Typically, this
@@ -32,7 +31,6 @@ func NewKeeper(
 	accountKeeper types.AccountKeeper,
 	bankKeeper types.BankKeeper,
 	clientKeeper types.ClientKeeper,
-	channelKeeper types.ChannelKeeper,
 	wasmKeeper types.WasmKeeper,
 	authority string,
 ) Keeper {
@@ -46,7 +44,6 @@ func NewKeeper(
 		bankKeeper:    bankKeeper,
 		accountKeeper: accountKeeper,
 		clientKeeper:  clientKeeper,
-		channelKeeper: channelKeeper,
 		wasmKeeper:    wasmKeeper,
 		authority:     authority,
 	}

diff --git a/x/btcstkconsumer/keeper/msg_server_test.go b/x/btcstkconsumer/keeper/msg_server_test.go
@@ -102,6 +102,7 @@ func FuzzRegisterConsumer(f *testing.F) {
 		consumerRegister2, err = bscKeeper.GetConsumerRegister(ctx, consumerRegister.ConsumerId)
 		require.NoError(t, err)
 		require.Equal(t, consumerRegister.String(), consumerRegister2.String())
+		require.Equal(t, types.ConsumerType_ETH_L2, consumerRegister2.Type())
 	})
 }
 

diff --git a/x/btcstkconsumer/types/expected_keepers.go b/x/btcstkconsumer/types/expected_keepers.go
@@ -28,9 +28,6 @@ type WasmKeeper interface {
 	GetContractInfo(ctx context.Context, contractAddress sdk.AccAddress) *wasmtypes.ContractInfo
 }
 
-type ChannelKeeper interface {
-}
-
 // ParamSubspace defines the expected Subspace interface for parameters.
 type ParamSubspace interface {
 	Get(context.Context, []byte, interface{})
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,6 @@ func BTCStakingKeeperWithStore( @@
     		nil,
     		nil,
     		nil,
-    		nil,
     		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
     	)
@@ Expand Down @@