fix conflicts

cosmos · Oct 2, 2022 · 0db3cb0 · 0db3cb0
1 parent 4d0a066
commit 0db3cb0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/tests/integration/staking/keeper/unbonding_test.go b/tests/integration/staking/keeper/unbonding_test.go
@@ -9,7 +9,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktestutil "github.com/cosmos/cosmos-sdk/x/bank/testutil"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
-	"github.com/cosmos/cosmos-sdk/x/staking/teststaking"
 	"github.com/cosmos/cosmos-sdk/x/staking/testutil"
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/stretchr/testify/require"
@@ -55,7 +54,7 @@ func (suite *IntegrationTestSuite) SetupUnbondingTests(t *testing.T, hookCalled
 	suite.app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)
 
 	// Create a validator
-	validator1 := teststaking.NewValidator(t, addrVals[0], PKs[0])
+	validator1 := testutil.NewValidator(t, addrVals[0], PKs[0])
 	validator1, issuedShares1 := validator1.AddTokensFromDel(valTokens)
 	require.Equal(t, valTokens, issuedShares1.RoundInt())
 
@@ -68,7 +67,7 @@ func (suite *IntegrationTestSuite) SetupUnbondingTests(t *testing.T, hookCalled
 	suite.app.StakingKeeper.SetDelegation(ctx, delegation)
 
 	// Create a validator to redelegate to
-	validator2 := teststaking.NewValidator(t, addrVals[1], PKs[1])
+	validator2 := testutil.NewValidator(t, addrVals[1], PKs[1])
 	validator2, issuedShares2 := validator2.AddTokensFromDel(valTokens)
 	require.Equal(t, valTokens, issuedShares2.RoundInt())
 

diff --git a/x/staking/keeper/unbonding_test.go b/x/staking/keeper/unbonding_test.go
@@ -8,7 +8,6 @@ import (
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
-	"github.com/cosmos/cosmos-sdk/x/staking/teststaking"
 	"github.com/cosmos/cosmos-sdk/x/staking/testutil"
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/golang/mock/gomock"
@@ -55,7 +54,7 @@ func (s *KeeperTestSuite) SetupUnbondingTests(t *testing.T, hookCalled *bool, ub
 	s.accountKeeper.SetModuleAccount(ctx, notBondedPool)
 
 	// Create a validator
-	validator1 := teststaking.NewValidator(t, addrVals[0], PKs[0])
+	validator1 := testutil.NewValidator(t, addrVals[0], PKs[0])
 	validator1, issuedShares1 := validator1.AddTokensFromDel(valTokens)
 	require.Equal(t, valTokens, issuedShares1.RoundInt())
 
@@ -68,7 +67,7 @@ func (s *KeeperTestSuite) SetupUnbondingTests(t *testing.T, hookCalled *bool, ub
 	s.stakingKeeper.SetDelegation(ctx, delegation)
 
 	// Create a validator to redelegate to
-	validator2 := teststaking.NewValidator(t, addrVals[1], PKs[1])
+	validator2 := testutil.NewValidator(t, addrVals[1], PKs[1])
 	validator2, issuedShares2 := validator2.AddTokensFromDel(valTokens)
 	require.Equal(t, valTokens, issuedShares2.RoundInt())