From 0db3cb0587157952a8383ef8d7815d3262464341 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Sun, 2 Oct 2022 21:13:16 +0200 Subject: [PATCH] fix conflicts --- tests/integration/staking/keeper/unbonding_test.go | 5 ++--- x/staking/keeper/unbonding_test.go | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/integration/staking/keeper/unbonding_test.go b/tests/integration/staking/keeper/unbonding_test.go index 99c9507e0981..af7957208b8e 100644 --- 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 index 5a8ed5cc68c0..569d2411e885 100644 --- 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())