Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade cosmos-sdk v0.45.4 #356

Merged
merged 11 commits into from Jun 30, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/app.go
Expand Up @@ -942,7 +942,8 @@ func (app *App) registerUpgradeHandlers() error {

if upgradeInfo.Name == "v2.2.0-alpha1" && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
storeUpgrades := storetypes.StoreUpgrades{
Added: []string{"authz", "feegrant"},
Added: []string{"authz", "feegrant"},
Deleted: []string{"token"},
}

// configure store loader that checks if version == upgradeHeight and applies store upgrades
Expand Down
2 changes: 1 addition & 1 deletion cmd/panacead/cmd/init.go
Expand Up @@ -123,7 +123,7 @@ func overrideGenesis(cdc codec.JSONCodec, genDoc *types.GenesisDoc) (json.RawMes
minDepositTokens := sdk.TokensFromConsensusPower(100000, sdk.DefaultPowerReduction) // 100,000 MED
govGenState.DepositParams.MinDeposit = sdk.Coins{sdk.NewCoin(assets.MicroMedDenom, minDepositTokens)}
govGenState.DepositParams.MaxDepositPeriod = 60 * 60 * 24 * 14 * time.Second // 14 days
govGenState.VotingParams.VotingPeriod = 60 * 60 * 24 * 14 * time.Second // 14 days
govGenState.VotingParams.VotingPeriod = 60 * 60 * 24 * 3 * time.Second // 3 days (shortened voting period: https://www.mintscan.io/medibloc/proposals/5)
appState[govtypes.ModuleName] = cdc.MustMarshalJSON(&govGenState)

var crisisGenState crisistypes.GenesisState
Expand Down
8 changes: 8 additions & 0 deletions types/testsuite/suite.go
Expand Up @@ -301,6 +301,14 @@ func (suite *TestSuite) GetAccAddress() sdk.AccAddress {
return sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address())
}

func (suite *TestSuite) FundAccount(bankKeeper bankkeeper.Keeper, ctx sdk.Context, addr sdk.AccAddress, amounts sdk.Coins) error {
gyuguen marked this conversation as resolved.
Show resolved Hide resolved
if err := bankKeeper.MintCoins(ctx, minttypes.ModuleName, amounts); err != nil {
return err
}

return bankKeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, addr, amounts)
}

func NewTestProtocolVersionSetter() TestProtocolVersionSetter {
return TestProtocolVersionSetter{}
}
Expand Down
4 changes: 1 addition & 3 deletions x/burn/keeper/burn_test.go
Expand Up @@ -3,8 +3,6 @@ package keeper_test
import (
"testing"

"github.com/cosmos/cosmos-sdk/simapp"

"github.com/medibloc/panacea-core/v2/types/testsuite"

sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down Expand Up @@ -47,7 +45,7 @@ func (suite *BurnTestSuite) BeforeTest(_, _ string) {

for _, addr := range address {
// mint coins and send to each account
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, addr, initCoins)
err := suite.FundAccount(bankKeeper, suite.Ctx, addr, initCoins)
suite.Require().NoError(err)
}

Expand Down
4 changes: 1 addition & 3 deletions x/datadeal/genesis_test.go
Expand Up @@ -3,8 +3,6 @@ package datadeal_test
import (
"testing"

"github.com/cosmos/cosmos-sdk/simapp"

oracletypes "github.com/medibloc/panacea-core/v2/x/oracle/types"

sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down Expand Up @@ -94,7 +92,7 @@ func (suite *genesisTestSuite) TestDataDealExportGenesis() {
NextDealNumber: 2,
})

err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down
50 changes: 24 additions & 26 deletions x/datadeal/keeper/deal_test.go
Expand Up @@ -4,8 +4,6 @@ import (
"strconv"
"testing"

"github.com/cosmos/cosmos-sdk/simapp"

oracletypes "github.com/medibloc/panacea-core/v2/x/oracle/types"

"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
Expand Down Expand Up @@ -42,7 +40,7 @@ func (suite *dealTestSuite) BeforeTest(_, _ string) {
}

func (suite *dealTestSuite) TestCreateNewDeal() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down Expand Up @@ -99,7 +97,7 @@ func (suite *dealTestSuite) TestGetDeal() {
}

func (suite *dealTestSuite) TestListDeals() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down Expand Up @@ -149,7 +147,7 @@ func (suite *dealTestSuite) TestListDeals() {
}

func (suite *dealTestSuite) TestGetBalanceOfDeal() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down Expand Up @@ -188,10 +186,10 @@ func (suite *dealTestSuite) TestGetBalanceOfDeal() {
}

func (suite *dealTestSuite) TestSellOwnData() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
suite.Require().NoError(err)

err = simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
err = suite.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down Expand Up @@ -232,10 +230,10 @@ func (suite *dealTestSuite) TestSellOwnData() {
}

func (suite *dealTestSuite) TestIsDataCertDuplicate() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, sdk.NewCoins(sdk.NewCoin(assets.MicroMedDenom, sdk.NewInt(10000000000))))
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, sdk.NewCoins(sdk.NewCoin(assets.MicroMedDenom, sdk.NewInt(10000000000))))
suite.Require().NoError(err)

err = simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
err = suite.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down Expand Up @@ -271,10 +269,10 @@ func (suite *dealTestSuite) TestIsDataCertDuplicate() {
}

func (suite *dealTestSuite) TestIsTrustedOracles_Invalid() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
suite.Require().NoError(err)

err = simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
err = suite.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down Expand Up @@ -304,10 +302,10 @@ func (suite *dealTestSuite) TestIsTrustedOracles_Invalid() {
}

func (suite *dealTestSuite) TestDealStatusInactiveOrCompleted() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
suite.Require().NoError(err)

err = simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
err = suite.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down Expand Up @@ -364,13 +362,13 @@ func (suite *dealTestSuite) TestVerifyDataCert() {
}

func (suite *dealTestSuite) TestIsDealStatusCompleted() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
suite.Require().NoError(err)

err = simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc2, zeroFunds)
err = suite.FundAccount(suite.BankKeeper, suite.Ctx, acc2, zeroFunds)
suite.Require().NoError(err)

err = simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
err = suite.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down Expand Up @@ -411,10 +409,10 @@ func (suite *dealTestSuite) TestIsDealStatusCompleted() {
}

func (suite *dealTestSuite) TestGetDataCert() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
suite.Require().NoError(err)

err = simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
err = suite.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down Expand Up @@ -457,10 +455,10 @@ func (suite *dealTestSuite) TestGetDataCert() {
}

func (suite *dealTestSuite) TestListDataCerts() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, defaultFunds)
suite.Require().NoError(err)

err = simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
err = suite.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down Expand Up @@ -508,10 +506,10 @@ func (suite *dealTestSuite) TestListDataCerts() {
}

func (suite *dealTestSuite) TestDeactivateDeal() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, sdk.NewCoins(sdk.NewCoin(assets.MicroMedDenom, sdk.NewInt(10000000000))))
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, sdk.NewCoins(sdk.NewCoin(assets.MicroMedDenom, sdk.NewInt(10000000000))))
suite.Require().NoError(err)

err = simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
err = suite.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down Expand Up @@ -560,10 +558,10 @@ func (suite *dealTestSuite) TestDeactivateDeal() {
}

func (suite *dealTestSuite) TestIsNotEqualOwner() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, sdk.NewCoins(sdk.NewCoin(assets.MicroMedDenom, sdk.NewInt(10000000000))))
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, sdk.NewCoins(sdk.NewCoin(assets.MicroMedDenom, sdk.NewInt(10000000000))))
suite.Require().NoError(err)

err = simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
err = suite.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down Expand Up @@ -596,10 +594,10 @@ func (suite *dealTestSuite) TestIsNotEqualOwner() {
}

func (suite *dealTestSuite) TestDealIsNotActive() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc1, sdk.NewCoins(sdk.NewCoin(assets.MicroMedDenom, sdk.NewInt(10000000000))))
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, acc1, sdk.NewCoins(sdk.NewCoin(assets.MicroMedDenom, sdk.NewInt(10000000000))))
suite.Require().NoError(err)

err = simapp.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
err = suite.FundAccount(suite.BankKeeper, suite.Ctx, acc3, zeroFunds)
suite.Require().NoError(err)

tempDeal := types.Deal{
Expand Down
4 changes: 1 addition & 3 deletions x/datapool/keeper/pool_distribution_test.go
Expand Up @@ -3,8 +3,6 @@ package keeper_test
import (
"fmt"

"github.com/cosmos/cosmos-sdk/simapp"

"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/medibloc/panacea-core/v2/types/assets"
Expand Down Expand Up @@ -34,7 +32,7 @@ func setupRevenueDistributionTest(suite poolTestSuite, targetNumData, poolMaxNft

func buyDataPass(suite poolTestSuite, poolID, count uint64) {
// Buyer buys DataPass.
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
suite.Require().NoError(err)

for i := uint64(0); i < count; i++ {
Expand Down
32 changes: 15 additions & 17 deletions x/datapool/keeper/pool_test.go
Expand Up @@ -7,8 +7,6 @@ import (
"strings"
"testing"

"github.com/cosmos/cosmos-sdk/simapp"

oracletypes "github.com/medibloc/panacea-core/v2/x/oracle/types"

"github.com/cosmos/cosmos-sdk/codec"
Expand Down Expand Up @@ -81,11 +79,11 @@ func (suite poolTestSuite) setupNFTContract() {
func (suite poolTestSuite) setupCreatePool(targetNumData, maxNftSupply uint64) uint64 {
suite.setupNFTContract()

err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, curatorAddr, fundForCurator)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, curatorAddr, fundForCurator)
suite.Require().NoError(err)

// register oracle
err = simapp.FundAccount(suite.BankKeeper, suite.Ctx, oracle1, fundForOracle)
err = suite.FundAccount(suite.BankKeeper, suite.Ctx, oracle1, fundForOracle)
suite.Require().NoError(err)

oracle := oracletypes.Oracle{
Expand Down Expand Up @@ -159,7 +157,7 @@ func (suite poolTestSuite) TestNotRegisteredOracle() {
// create and instantiate NFT contract
suite.setupNFTContract()

err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, curatorAddr, fundForCurator)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, curatorAddr, fundForCurator)
suite.Require().NoError(err)

newPoolParams := makePoolParamsWithOracle(defaultTargetNumData, defaultMaxNftSupply)
Expand All @@ -179,7 +177,7 @@ func (suite poolTestSuite) TestNotEnoughBalanceForDeposit() {
}

func (suite poolTestSuite) TestNotRegisteredNFTContract() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, curatorAddr, fundForCurator)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, curatorAddr, fundForCurator)
suite.Require().NoError(err)

newPoolParams := makePoolParamsNoOracle(defaultMaxNftSupply)
Expand All @@ -192,7 +190,7 @@ func (suite poolTestSuite) TestBuyDataPassPending() {
// create pool
poolID := suite.setupCreatePool(defaultTargetNumData, defaultMaxNftSupply)

err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
suite.Require().NoError(err)

err = suite.DataPoolKeeper.BuyDataPass(suite.Ctx, buyerAddr, poolID, 1, NFTPrice)
Expand All @@ -210,7 +208,7 @@ func (suite poolTestSuite) TestBuyDataPassPoolNotFound() {
// create pool
suite.setupCreatePool(defaultTargetNumData, defaultMaxNftSupply)

err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
suite.Require().NoError(err)

// buy NFT other data pool
Expand All @@ -222,7 +220,7 @@ func (suite poolTestSuite) TestBuyDataPassSoldOut() {
// create pool w/ NFT max supply of 1
poolID := suite.setupCreatePool(defaultTargetNumData, 1)

err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
suite.Require().NoError(err)

// buy 1 NFT
Expand All @@ -238,7 +236,7 @@ func (suite poolTestSuite) TestBuyDataPassRoundNotMatched() {
// create pool
poolID := suite.setupCreatePool(defaultTargetNumData, defaultMaxNftSupply)

err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
suite.Require().NoError(err)

// different round
Expand All @@ -250,7 +248,7 @@ func (suite poolTestSuite) TestBuyDataPassPaymentNotMatched() {
// create pool
poolID := suite.setupCreatePool(defaultTargetNumData, defaultMaxNftSupply)

err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
suite.Require().NoError(err)

// buy NFT with different payment
Expand All @@ -263,15 +261,15 @@ func (suite poolTestSuite) TestBuyDataPassInsufficientBalance() {
poolID := suite.setupCreatePool(defaultTargetNumData, defaultMaxNftSupply)

// buyer with small balance
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, sdk.NewCoins(sdk.NewCoin(assets.MicroMedDenom, sdk.NewInt(1000))))
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, sdk.NewCoins(sdk.NewCoin(assets.MicroMedDenom, sdk.NewInt(1000))))
suite.Require().NoError(err)

err = suite.DataPoolKeeper.BuyDataPass(suite.Ctx, buyerAddr, poolID, 1, NFTPrice)
suite.Require().Error(err, sdkerrors.ErrInsufficientFunds)
}

func (suite poolTestSuite) TestNotEnoughDeposit() {
err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, curatorAddr, fundForCurator)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, curatorAddr, fundForCurator)
suite.Require().NoError(err)

newPoolParams := makePoolParamsNoOracle(defaultMaxNftSupply)
Expand All @@ -286,7 +284,7 @@ func (suite poolTestSuite) TestNotEnoughDeposit() {
func (suite poolTestSuite) TestRedeemDataPass() {
poolID := suite.setupCreatePool(1, defaultMaxNftSupply)

err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
suite.Require().NoError(err)

err = suite.DataPoolKeeper.BuyDataPass(suite.Ctx, buyerAddr, poolID, 1, NFTPrice)
Expand All @@ -312,7 +310,7 @@ func (suite poolTestSuite) TestRedeemDataPass() {
func (suite poolTestSuite) TestGetRedeemerDataPass() {
poolID := suite.setupCreatePool(1, defaultMaxNftSupply)

err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
suite.Require().NoError(err)

err = suite.DataPoolKeeper.BuyDataPass(suite.Ctx, buyerAddr, poolID, 1, NFTPrice)
Expand All @@ -334,7 +332,7 @@ func (suite poolTestSuite) TestGetRedeemerDataPass() {
func (suite poolTestSuite) TestRedeemDataPassRoundNotMatched() {
poolID := suite.setupCreatePool(1, defaultMaxNftSupply)

err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
suite.Require().NoError(err)

err = suite.DataPoolKeeper.BuyDataPass(suite.Ctx, buyerAddr, poolID, 1, NFTPrice)
Expand All @@ -349,7 +347,7 @@ func (suite poolTestSuite) TestRedeemDataPassRoundNotMatched() {
func (suite poolTestSuite) TestNotOwnedRedeemerNFT() {
poolID := suite.setupCreatePool(1, defaultMaxNftSupply)

err := simapp.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
err := suite.FundAccount(suite.BankKeeper, suite.Ctx, buyerAddr, fundForBuyer)
suite.Require().NoError(err)

err = suite.DataPoolKeeper.BuyDataPass(suite.Ctx, buyerAddr, poolID, 1, NFTPrice)
Expand Down