wip

omni-network · Jan 17, 2025 · c31a21b · c31a21b
1 parent a6824f3
commit c31a21b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 20 deletions.
diff --git a/halo/evmstaking/evmstaking.go b/halo/evmstaking/evmstaking.go
@@ -1,5 +1,4 @@
 // Package evmstaking monitors the Staking pre-deploy contract and converts
-// Package evmstaking monitors the Staking pre-deploy contract and converts
 // its log events to cosmosSDK x/staking logic.
 package evmstaking
 
@@ -195,7 +194,7 @@ func (p EventProcessor) deliverDelegate(ctx context.Context, ev *bindings.Stakin
 		return errors.Wrap(err, "mint coins")
 	}
 
-	if err := p.bKeeper.SendCoinsFromModuleToAccount(ctx, ModuleName, delAddr, amountCoins); err != nil {
+	if err := p.bKeeper.SendCoinsFromModuleToAccountForReal(ctx, ModuleName, delAddr, amountCoins); err != nil {
 		return errors.Wrap(err, "send coins")
 	}
 

diff --git a/halo/evmstaking2/testutil/mock_interfaces.go b/halo/evmstaking2/testutil/mock_interfaces.go
diff --git a/halo/evmstaking2/types/interfaces.go b/halo/evmstaking2/types/interfaces.go
@@ -16,7 +16,6 @@ type AuthKeeper interface {
 
 type BankKeeper interface {
 	MintCoins(ctx context.Context, moduleName string, amt sdk.Coins) error
-	SendCoinsFromModuleToAccount(ctx context.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
 	SendCoinsFromModuleToAccountForReal(ctx context.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
 }
 

diff --git a/halo/mybank/depinject.go b/halo/mybank/depinject.go
@@ -8,7 +8,7 @@ import (
 type DIInputs struct {
 	depinject.In
 
-	BankKeeper *bankkeeper.Keeper
+	BankKeeper bankkeeper.BaseKeeper
 }
 
 type DIOutputs struct {
@@ -19,7 +19,7 @@ type DIOutputs struct {
 
 func DIProvide(input DIInputs) (DIOutputs, error) {
 	k := Keeper{
-		Keeper: *input.BankKeeper,
+		Keeper: input.BankKeeper,
 	}
 
 	return DIOutputs{

diff --git a/halo/mybank/mybank.go b/halo/mybank/mybank.go
@@ -1,5 +1,7 @@
 // Package evmupgrade monitors the Upgrade pre-deploy contract and converts
 // its log events to cosmosSDK x/upgrade logic.
+//
+//nolint:wrapcheck // Wrapping not needed in this package.
 package mybank
 
 import (
@@ -20,7 +22,7 @@ type Keeper struct {
 func (k Keeper) SendCoinsFromModuleToAccountForReal(ctx context.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error {
 	log.Info(ctx, "Wrapped method called")
 
-	return k.SendCoinsFromModuleToAccount(ctx, senderModule, recipientAddr, amt)
+	return k.Keeper.SendCoinsFromModuleToAccount(ctx, senderModule, recipientAddr, amt)
 }
 
 func (Keeper) SendCoinsFromModuleToAccount(context.Context, string, sdk.AccAddress, sdk.Coins) error {