@@ -40,7 +40,7 @@ const (
4040 altPw = "12345678901"
4141)
4242
43- var fees = sdk.Coins {sdk .NewInt64Coin (staking .DefaultBondDenom , 5 )}
43+ var fees = sdk.Coins {sdk .NewInt64Coin (sdk .DefaultBondDenom , 5 )}
4444
4545func init () {
4646 mintkey .BcryptSecurityParameter = 1
@@ -243,14 +243,14 @@ func TestCoinSend(t *testing.T) {
243243 coins := acc .GetCoins ()
244244 expectedBalance := initialBalance [0 ].Minus (fees [0 ])
245245
246- require .Equal (t , staking .DefaultBondDenom , coins [0 ].Denom )
246+ require .Equal (t , sdk .DefaultBondDenom , coins [0 ].Denom )
247247 require .Equal (t , expectedBalance .Amount .SubRaw (1 ), coins [0 ].Amount )
248248 expectedBalance = coins [0 ]
249249
250250 // query receiver
251251 acc2 := getAccount (t , port , receiveAddr )
252252 coins2 := acc2 .GetCoins ()
253- require .Equal (t , staking .DefaultBondDenom , coins2 [0 ].Denom )
253+ require .Equal (t , sdk .DefaultBondDenom , coins2 [0 ].Denom )
254254 require .Equal (t , int64 (1 ), coins2 [0 ].Amount .Int64 ())
255255
256256 // test failure with too little gas
@@ -286,7 +286,7 @@ func TestCoinSend(t *testing.T) {
286286 require .NotZero (t , gasEstResp .GasEstimate )
287287
288288 acc = getAccount (t , port , addr )
289- require .Equal (t , expectedBalance .Amount , acc .GetCoins ().AmountOf (staking .DefaultBondDenom ))
289+ require .Equal (t , expectedBalance .Amount , acc .GetCoins ().AmountOf (sdk .DefaultBondDenom ))
290290
291291 // run successful tx
292292 gas := fmt .Sprintf ("%d" , gasEstResp .GasEstimate )
@@ -301,7 +301,7 @@ func TestCoinSend(t *testing.T) {
301301
302302 acc = getAccount (t , port , addr )
303303 expectedBalance = expectedBalance .Minus (fees [0 ])
304- require .Equal (t , expectedBalance .Amount .SubRaw (1 ), acc .GetCoins ().AmountOf (staking .DefaultBondDenom ))
304+ require .Equal (t , expectedBalance .Amount .SubRaw (1 ), acc .GetCoins ().AmountOf (sdk .DefaultBondDenom ))
305305}
306306
307307func TestCoinSendAccAuto (t * testing.T ) {
@@ -323,7 +323,7 @@ func TestCoinSendAccAuto(t *testing.T) {
323323 coins := acc .GetCoins ()
324324 expectedBalance := initialBalance [0 ].Minus (fees [0 ])
325325
326- require .Equal (t , staking .DefaultBondDenom , coins [0 ].Denom )
326+ require .Equal (t , sdk .DefaultBondDenom , coins [0 ].Denom )
327327 require .Equal (t , expectedBalance .Amount .SubRaw (1 ), coins [0 ].Amount )
328328}
329329
@@ -520,11 +520,11 @@ func TestPoolParamsQuery(t *testing.T) {
520520 pool := getStakingPool (t , port )
521521
522522 initialPool := staking .InitialPool ()
523- tokens := staking .TokensFromTendermintPower (100 )
524- freeFermions := staking .TokensFromTendermintPower (50 )
523+ tokens := sdk .TokensFromTendermintPower (100 )
524+ freeTokens := sdk .TokensFromTendermintPower (50 )
525525 initialPool .NotBondedTokens = initialPool .NotBondedTokens .Add (tokens )
526- initialPool .BondedTokens = initialPool .BondedTokens .Add (tokens ) // Delegate tx on GaiaAppGenState
527- initialPool .NotBondedTokens = initialPool .NotBondedTokens .Add (freeFermions ) // freeFermionsAcc = 50 on GaiaAppGenState
526+ initialPool .BondedTokens = initialPool .BondedTokens .Add (tokens ) // Delegate tx on GaiaAppGenState
527+ initialPool .NotBondedTokens = initialPool .NotBondedTokens .Add (freeTokens ) // freeTokensPerAcc = 50 on GaiaAppGenState
528528
529529 require .Equal (t , initialPool .BondedTokens , pool .BondedTokens )
530530
@@ -575,15 +575,15 @@ func TestBonding(t *testing.T) {
575575 require .Equal (t , 2 , len (valPubKeys ))
576576 require .Equal (t , 2 , len (operAddrs ))
577577
578- amt := staking .TokensFromTendermintPower (60 )
578+ amt := sdk .TokensFromTendermintPower (60 )
579579 amtDec := sdk .NewDecFromInt (amt )
580580 validator := getValidator (t , port , operAddrs [0 ])
581581
582582 acc := getAccount (t , port , addr )
583583 initialBalance := acc .GetCoins ()
584584
585585 // create bond TX
586- delTokens := staking .TokensFromTendermintPower (60 )
586+ delTokens := sdk .TokensFromTendermintPower (60 )
587587 resultTx := doDelegate (t , port , name1 , pw , addr , operAddrs [0 ], delTokens , fees )
588588 tests .WaitForHeight (resultTx .Height + 1 , port )
589589
@@ -601,7 +601,7 @@ func TestBonding(t *testing.T) {
601601 acc = getAccount (t , port , addr )
602602 coins := acc .GetCoins ()
603603 expectedBalance := initialBalance [0 ].Minus (fees [0 ])
604- require .Equal (t , expectedBalance .Amount .Sub (delTokens ), coins .AmountOf (staking .DefaultBondDenom ))
604+ require .Equal (t , expectedBalance .Amount .Sub (delTokens ), coins .AmountOf (sdk .DefaultBondDenom ))
605605 expectedBalance = coins [0 ]
606606
607607 // query delegation
@@ -625,7 +625,7 @@ func TestBonding(t *testing.T) {
625625 require .Equal (t , operAddrs [0 ], bondedValidator .OperatorAddr )
626626
627627 // testing unbonding
628- unbondingTokens := staking .TokensFromTendermintPower (30 )
628+ unbondingTokens := sdk .TokensFromTendermintPower (30 )
629629 resultTx = doUndelegate (t , port , name1 , pw , addr , operAddrs [0 ], unbondingTokens , fees )
630630 tests .WaitForHeight (resultTx .Height + 1 , port )
631631
@@ -636,8 +636,8 @@ func TestBonding(t *testing.T) {
636636 coins = acc .GetCoins ()
637637 expectedBalance = expectedBalance .Minus (fees [0 ])
638638 require .True (t ,
639- expectedBalance .Amount .LT (coins .AmountOf (staking .DefaultBondDenom )) ||
640- expectedBalance .Amount .Equal (coins .AmountOf (staking .DefaultBondDenom )),
639+ expectedBalance .Amount .LT (coins .AmountOf (sdk .DefaultBondDenom )) ||
640+ expectedBalance .Amount .Equal (coins .AmountOf (sdk .DefaultBondDenom )),
641641 "should get tokens back from automatic withdrawal after an unbonding delegation" ,
642642 )
643643 expectedBalance = coins [0 ]
@@ -655,7 +655,7 @@ func TestBonding(t *testing.T) {
655655 require .Equal (t , delTokens .DivRaw (2 ), ubd .Entries [0 ].Balance )
656656
657657 // test redelegation
658- rdTokens := staking .TokensFromTendermintPower (30 )
658+ rdTokens := sdk .TokensFromTendermintPower (30 )
659659 resultTx = doBeginRedelegation (t , port , name1 , pw , addr , operAddrs [0 ], operAddrs [1 ], rdTokens , fees )
660660 tests .WaitForHeight (resultTx .Height + 1 , port )
661661
@@ -665,8 +665,8 @@ func TestBonding(t *testing.T) {
665665 acc = getAccount (t , port , addr )
666666 expectedBalance = expectedBalance .Minus (fees [0 ])
667667 require .True (t ,
668- expectedBalance .Amount .LT (coins .AmountOf (staking .DefaultBondDenom )) ||
669- expectedBalance .Amount .Equal (coins .AmountOf (staking .DefaultBondDenom )),
668+ expectedBalance .Amount .LT (coins .AmountOf (sdk .DefaultBondDenom )) ||
669+ expectedBalance .Amount .Equal (coins .AmountOf (sdk .DefaultBondDenom )),
670670 "should get tokens back from automatic withdrawal after an unbonding delegation" ,
671671 )
672672
@@ -735,7 +735,7 @@ func TestSubmitProposal(t *testing.T) {
735735 initialBalance := acc .GetCoins ()
736736
737737 // create SubmitProposal TX
738- proposalTokens := staking .TokensFromTendermintPower (5 )
738+ proposalTokens := sdk .TokensFromTendermintPower (5 )
739739 resultTx := doSubmitProposal (t , port , seed , name1 , pw , addr , proposalTokens , fees )
740740 tests .WaitForHeight (resultTx .Height + 1 , port )
741741
@@ -748,7 +748,7 @@ func TestSubmitProposal(t *testing.T) {
748748 // verify balance
749749 acc = getAccount (t , port , addr )
750750 expectedBalance := initialBalance [0 ].Minus (fees [0 ])
751- require .Equal (t , expectedBalance .Amount .Sub (proposalTokens ), acc .GetCoins ().AmountOf (staking .DefaultBondDenom ))
751+ require .Equal (t , expectedBalance .Amount .Sub (proposalTokens ), acc .GetCoins ().AmountOf (sdk .DefaultBondDenom ))
752752
753753 // query proposal
754754 proposal := getProposal (t , port , proposalID )
@@ -770,7 +770,7 @@ func TestDeposit(t *testing.T) {
770770 initialBalance := acc .GetCoins ()
771771
772772 // create SubmitProposal TX
773- proposalTokens := staking .TokensFromTendermintPower (5 )
773+ proposalTokens := sdk .TokensFromTendermintPower (5 )
774774 resultTx := doSubmitProposal (t , port , seed , name1 , pw , addr , proposalTokens , fees )
775775 tests .WaitForHeight (resultTx .Height + 1 , port )
776776
@@ -784,30 +784,30 @@ func TestDeposit(t *testing.T) {
784784 acc = getAccount (t , port , addr )
785785 coins := acc .GetCoins ()
786786 expectedBalance := initialBalance [0 ].Minus (fees [0 ])
787- require .Equal (t , expectedBalance .Amount .Sub (proposalTokens ), coins .AmountOf (staking .DefaultBondDenom ))
787+ require .Equal (t , expectedBalance .Amount .Sub (proposalTokens ), coins .AmountOf (sdk .DefaultBondDenom ))
788788 expectedBalance = coins [0 ]
789789
790790 // query proposal
791791 proposal := getProposal (t , port , proposalID )
792792 require .Equal (t , "Test" , proposal .GetTitle ())
793793
794794 // create SubmitProposal TX
795- depositTokens := staking .TokensFromTendermintPower (5 )
795+ depositTokens := sdk .TokensFromTendermintPower (5 )
796796 resultTx = doDeposit (t , port , seed , name1 , pw , addr , proposalID , depositTokens , fees )
797797 tests .WaitForHeight (resultTx .Height + 1 , port )
798798
799799 // verify balance after deposit and fee
800800 acc = getAccount (t , port , addr )
801801 expectedBalance = expectedBalance .Minus (fees [0 ])
802- require .Equal (t , expectedBalance .Amount .Sub (depositTokens ), acc .GetCoins ().AmountOf (staking .DefaultBondDenom ))
802+ require .Equal (t , expectedBalance .Amount .Sub (depositTokens ), acc .GetCoins ().AmountOf (sdk .DefaultBondDenom ))
803803
804804 // query tx
805805 txs := getTransactions (t , port , fmt .Sprintf ("action=deposit&depositor=%s" , addr ))
806806 require .Len (t , txs , 1 )
807807 require .Equal (t , resultTx .Height , txs [0 ].Height )
808808
809809 // query proposal
810- totalCoins := sdk.Coins {sdk .NewCoin (staking .DefaultBondDenom , staking .TokensFromTendermintPower (10 ))}
810+ totalCoins := sdk.Coins {sdk .NewCoin (sdk .DefaultBondDenom , sdk .TokensFromTendermintPower (10 ))}
811811 proposal = getProposal (t , port , proposalID )
812812 require .True (t , proposal .GetTotalDeposit ().IsEqual (totalCoins ))
813813
@@ -827,7 +827,7 @@ func TestVote(t *testing.T) {
827827 initialBalance := acc .GetCoins ()
828828
829829 // create SubmitProposal TX
830- proposalTokens := staking .TokensFromTendermintPower (10 )
830+ proposalTokens := sdk .TokensFromTendermintPower (10 )
831831 resultTx := doSubmitProposal (t , port , seed , name1 , pw , addr , proposalTokens , fees )
832832 tests .WaitForHeight (resultTx .Height + 1 , port )
833833
@@ -841,7 +841,7 @@ func TestVote(t *testing.T) {
841841 acc = getAccount (t , port , addr )
842842 coins := acc .GetCoins ()
843843 expectedBalance := initialBalance [0 ].Minus (fees [0 ])
844- require .Equal (t , expectedBalance .Amount .Sub (proposalTokens ), coins .AmountOf (staking .DefaultBondDenom ))
844+ require .Equal (t , expectedBalance .Amount .Sub (proposalTokens ), coins .AmountOf (sdk .DefaultBondDenom ))
845845 expectedBalance = coins [0 ]
846846
847847 // query proposal
@@ -857,7 +857,7 @@ func TestVote(t *testing.T) {
857857 acc = getAccount (t , port , addr )
858858 coins = acc .GetCoins ()
859859 expectedBalance = expectedBalance .Minus (fees [0 ])
860- require .Equal (t , expectedBalance .Amount , coins .AmountOf (staking .DefaultBondDenom ))
860+ require .Equal (t , expectedBalance .Amount , coins .AmountOf (sdk .DefaultBondDenom ))
861861 expectedBalance = coins [0 ]
862862
863863 // query tx
@@ -873,15 +873,15 @@ func TestVote(t *testing.T) {
873873 require .Equal (t , sdk .ZeroInt (), tally .Yes , "tally should be 0 as the address is not bonded" )
874874
875875 // create bond TX
876- delTokens := staking .TokensFromTendermintPower (60 )
876+ delTokens := sdk .TokensFromTendermintPower (60 )
877877 resultTx = doDelegate (t , port , name1 , pw , addr , operAddrs [0 ], delTokens , fees )
878878 tests .WaitForHeight (resultTx .Height + 1 , port )
879879
880880 // verify balance
881881 acc = getAccount (t , port , addr )
882882 coins = acc .GetCoins ()
883883 expectedBalance = expectedBalance .Minus (fees [0 ])
884- require .Equal (t , expectedBalance .Amount .Sub (delTokens ), coins .AmountOf (staking .DefaultBondDenom ))
884+ require .Equal (t , expectedBalance .Amount .Sub (delTokens ), coins .AmountOf (sdk .DefaultBondDenom ))
885885 expectedBalance = coins [0 ]
886886
887887 tally = getTally (t , port , proposalID )
@@ -894,7 +894,7 @@ func TestVote(t *testing.T) {
894894 // verify balance
895895 acc = getAccount (t , port , addr )
896896 expectedBalance = expectedBalance .Minus (fees [0 ])
897- require .Equal (t , expectedBalance .Amount , acc .GetCoins ().AmountOf (staking .DefaultBondDenom ))
897+ require .Equal (t , expectedBalance .Amount , acc .GetCoins ().AmountOf (sdk .DefaultBondDenom ))
898898
899899 tally = getTally (t , port , proposalID )
900900 require .Equal (t , sdk .ZeroInt (), tally .Yes , "tally should be 0 the user changed the option" )
@@ -927,7 +927,7 @@ func TestProposalsQuery(t *testing.T) {
927927 defer cleanup ()
928928
929929 depositParam := getDepositParam (t , port )
930- halfMinDeposit := depositParam .MinDeposit .AmountOf (staking .DefaultBondDenom ).DivRaw (2 )
930+ halfMinDeposit := depositParam .MinDeposit .AmountOf (sdk .DefaultBondDenom ).DivRaw (2 )
931931 getVotingParam (t , port )
932932 getTallyingParam (t , port )
933933
@@ -974,7 +974,7 @@ func TestProposalsQuery(t *testing.T) {
974974 require .Equal (t , deposit , deposits [0 ])
975975
976976 // increasing the amount of the deposit should update the existing one
977- depositTokens := staking .TokensFromTendermintPower (1 )
977+ depositTokens := sdk .TokensFromTendermintPower (1 )
978978 resultTx = doDeposit (t , port , seeds [0 ], names [0 ], passwords [0 ], addrs [0 ], proposalID1 , depositTokens , fees )
979979 tests .WaitForHeight (resultTx .Height + 1 , port )
980980
@@ -1085,7 +1085,7 @@ func TestDistributionFlow(t *testing.T) {
10851085 require .Equal (t , valDistInfo .OperatorAddress .String (), sdk .AccAddress (valAddr ).String ())
10861086
10871087 // Delegate some coins
1088- delTokens := staking .TokensFromTendermintPower (60 )
1088+ delTokens := sdk .TokensFromTendermintPower (60 )
10891089 resultTx := doDelegate (t , port , name1 , pw , addr , valAddr , delTokens , fees )
10901090 tests .WaitForHeight (resultTx .Height + 1 , port )
10911091 require .Equal (t , uint32 (0 ), resultTx .Code )
0 commit comments