Skip to content

Commit

Permalink
remove unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
Dreamer committed Mar 7, 2024
1 parent 0043848 commit 1b10d56
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 156 deletions.
7 changes: 1 addition & 6 deletions modules/guardian/types/msgs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

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

"github.com/irisnet/irishub/v2/types"
_ "github.com/irisnet/irishub/v2/types"
)

// nolint: deadcode unused
Expand All @@ -22,11 +22,6 @@ var (
description = "description"
nilDescription = ""
)

func init() {
types.ConfigureBech32Prefix()
}

// ----------------------------------------------
// test MsgAddSuper
// ----------------------------------------------
Expand Down
61 changes: 0 additions & 61 deletions simapp/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ package simapp
import (
"encoding/json"
"io"
"os"
"path/filepath"

dbm "github.com/cometbft/cometbft-db"
abci "github.com/cometbft/cometbft/abci/types"
"github.com/cometbft/cometbft/crypto"
tmjson "github.com/cometbft/cometbft/libs/json"
"github.com/cometbft/cometbft/libs/log"
tmos "github.com/cometbft/cometbft/libs/os"
Expand Down Expand Up @@ -67,9 +64,6 @@ import (

simappparams "cosmossdk.io/simapp/params"

tokentypes "github.com/irisnet/irismod/modules/token/types"
tokenv1 "github.com/irisnet/irismod/modules/token/types/v1"

"github.com/irisnet/irishub/v2/client/lite"
"github.com/irisnet/irishub/v2/modules/guardian"
guardiankeeper "github.com/irisnet/irishub/v2/modules/guardian/keeper"
Expand All @@ -86,14 +80,6 @@ import (
const appName = "SimApp"

var (
// DefaultNodeHome default home directories for the application daemon
DefaultNodeHome string

// Denominations can be 3 ~ 128 characters long and support letters, followed by either
// a letter, a number, ('-'), or a separator ('/').
// overwite sdk reDnmString
reDnmString = `[a-zA-Z][a-zA-Z0-9/-]{2,127}`

// ModuleBasics defines the module BasicManager is in charge of setting up basic,
// non-dependant module elements, such as codec registration
// and genesis verification.
Expand Down Expand Up @@ -123,7 +109,6 @@ var (
stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
}

nativeToken tokenv1.Token
)

var (
Expand Down Expand Up @@ -174,52 +159,6 @@ type SimApp struct {
mttransferModule tibcmttransfer.AppModule
}

func init() {
// set bech32 prefix
iristypes.ConfigureBech32Prefix()

// set coin denom regexs
sdk.SetCoinDenomRegex(DefaultCoinDenomRegex)

nativeToken = tokenv1.Token{
Symbol: "iris",
Name: "Irishub staking token",
Scale: 6,
MinUnit: "uiris",
InitialSupply: 2000000000,
MaxSupply: 10000000000,
Mintable: true,
Owner: sdk.AccAddress(crypto.AddressHash([]byte(tokentypes.ModuleName))).String(),
}

userHomeDir, err := os.UserHomeDir()
if err != nil {
panic(err)
}

DefaultNodeHome = filepath.Join(userHomeDir, ".iris")
owner, err := sdk.AccAddressFromBech32(nativeToken.Owner)
if err != nil {
panic(err)
}

tokenv1.SetNativeToken(
nativeToken.Symbol,
nativeToken.Name,
nativeToken.MinUnit,
nativeToken.Scale,
nativeToken.InitialSupply,
nativeToken.MaxSupply,
nativeToken.Mintable,
owner,
)
}

// DefaultCoinDenomRegex returns the default regex string
func DefaultCoinDenomRegex() string {
return reDnmString
}

// NewSimApp returns a reference to an initialized IrisApp.
func NewSimApp(
logger log.Logger,
Expand Down
99 changes: 10 additions & 89 deletions simapp/test_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,20 @@ import (
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types"
clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli"
"github.com/cosmos/cosmos-sdk/testutil/mock"
"github.com/cosmos/cosmos-sdk/testutil/network"
simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/types/module/testutil"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

minttypes "github.com/irisnet/irishub/v2/modules/mint/types"
iristypes "github.com/irisnet/irishub/v2/types"
)

func setup(withGenesis bool, invCheckPeriod uint) (*SimApp, GenesisState) {
Expand All @@ -57,7 +56,7 @@ func setup(withGenesis bool, invCheckPeriod uint) (*SimApp, GenesisState) {
nil,
true,
map[int64]bool{},
DefaultNodeHome,
iristypes.DefaultNodeHome,
invCheckPeriod,
encCdc,
EmptyAppOptions{},
Expand Down Expand Up @@ -98,6 +97,7 @@ func Setup(t *testing.T, _ bool) *SimApp {
return app
}

// NewConfig returns a new app config
func NewConfig() network.Config {
cfg := network.DefaultConfig(NewTestNetworkFixture)
encCfg := MakeTestEncodingConfig() // redundant
Expand All @@ -112,7 +112,7 @@ func NewConfig() network.Config {
nil,
true,
nil,
DefaultNodeHome,
iristypes.DefaultNodeHome,
0,
encCfg,
EmptyAppOptions{},
Expand All @@ -124,14 +124,6 @@ func NewConfig() network.Config {
return cfg
}

func SimAppConstructor(val network.Validator) servertypes.Application {
return NewSimApp(
val.Ctx.Logger, dbm.NewMemDB(), nil, true, make(map[int64]bool),
val.Ctx.Config.RootDir, 0, MakeTestEncodingConfig(), EmptyAppOptions{},
bam.SetMinGasPrices(val.AppConfig.MinGasPrices),
)
}

// SetupWithGenesisValSet initializes a new SimApp with a validator set and genesis accounts
// that also act as delegators. For simplicity, each validator is bonded with a delegation
// of one consensus engine unit (10^6) in the default token of the simapp from first genesis
Expand Down Expand Up @@ -264,6 +256,7 @@ func GenesisStateWithValSet(codec codec.Codec, genesisState map[string]json.RawM
return genesisState, nil
}

// GenerateAccountStrategy is a strategy used by addTestAddrs() in order to generated addresses in random order
type GenerateAccountStrategy func(int) []sdk.AccAddress

// createRandomAccounts is a strategy used by addTestAddrs() in order to generated addresses in random order.
Expand Down Expand Up @@ -299,37 +292,6 @@ func createIncrementalAccounts(accNum int) []sdk.AccAddress {
return addresses
}

// AddTestAddrsFromPubKeys adds the addresses into the SimApp providing only the public keys.
func AddTestAddrsFromPubKeys(
app *SimApp,
ctx sdk.Context,
pubKeys []cryptotypes.PubKey,
accAmt sdk.Int,
) {
initCoins := sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), accAmt))
// fill all the addresses with some coins, set the loose pool tokens simultaneously
for _, pubKey := range pubKeys {
saveAccount(app, ctx, sdk.AccAddress(pubKey.Address()), initCoins)
}
}

// AddTestAddrs constructs and returns accNum amount of accounts with an
// initial balance of accAmt in random order
func AddTestAddrs(app *SimApp, ctx sdk.Context, accNum int, accAmt sdk.Int) []sdk.AccAddress {
return addTestAddrs(app, ctx, accNum, accAmt, createRandomAccounts)
}

// AddTestAddrsIncremental constructs and returns accNum amount of accounts with an
// initial balance of accAmt in random order
func AddTestAddrsIncremental(
app *SimApp,
ctx sdk.Context,
accNum int,
accAmt sdk.Int,
) []sdk.AccAddress {
return addTestAddrs(app, ctx, accNum, accAmt, createIncrementalAccounts)
}

func addTestAddrs(
app *SimApp,
ctx sdk.Context,
Expand Down Expand Up @@ -361,17 +323,7 @@ func saveAccount(app *SimApp, ctx sdk.Context, addr sdk.AccAddress, initCoins sd
}
}

// ConvertAddrsToValAddrs converts the provided addresses to ValAddress.
func ConvertAddrsToValAddrs(addrs []sdk.AccAddress) []sdk.ValAddress {
valAddrs := make([]sdk.ValAddress, len(addrs))

for i, addr := range addrs {
valAddrs[i] = sdk.ValAddress(addr)
}

return valAddrs
}

// TestAddr creates a test address
func TestAddr(addr string, bech string) (sdk.AccAddress, error) {
res, err := sdk.AccAddressFromHexUnsafe(addr)
if err != nil {
Expand All @@ -393,39 +345,6 @@ func TestAddr(addr string, bech string) (sdk.AccAddress, error) {
return res, nil
}

// CreateTestPubKeys returns a total of numPubKeys public keys in ascending order.
func CreateTestPubKeys(numPubKeys int) []cryptotypes.PubKey {
var publicKeys []cryptotypes.PubKey
var buffer bytes.Buffer

// start at 10 to avoid changing 1 to 01, 2 to 02, etc
for i := 100; i < (numPubKeys + 100); i++ {
numString := strconv.Itoa(i)
buffer.WriteString(
"0B485CFC0EECC619440448436F8FC9DF40566F2369E72400281454CB552AF",
) // base pubkey string
buffer.WriteString(
numString,
) // adding on final two digits to make pubkeys unique
publicKeys = append(publicKeys, NewPubKeyFromHex(buffer.String()))
buffer.Reset()
}

return publicKeys
}

// NewPubKeyFromHex returns a PubKey from a hex string.
func NewPubKeyFromHex(pk string) (res cryptotypes.PubKey) {
pkBytes, err := hex.DecodeString(pk)
if err != nil {
panic(err)
}
if len(pkBytes) != ed25519.PubKeySize {
panic(errors.Wrap(errors.ErrInvalidPubKey, "invalid pubkey size"))
}
return &ed25519.PubKey{Key: pkBytes}
}

// EmptyAppOptions is a stub implementing AppOptions
type EmptyAppOptions struct{}

Expand All @@ -450,7 +369,7 @@ func NewTestNetworkFixture() network.TestFixture {
nil,
true,
nil,
DefaultNodeHome,
iristypes.DefaultNodeHome,
0,
encodingConfig, // redundant
simtestutil.NewAppOptionsWithFlagHome(dir),
Expand All @@ -463,7 +382,7 @@ func NewTestNetworkFixture() network.TestFixture {
nil,
true,
nil,
DefaultNodeHome,
iristypes.DefaultNodeHome,
0,
encodingConfig, // redundant
simtestutil.NewAppOptionsWithFlagHome(val.GetCtx().Config.RootDir),
Expand All @@ -485,6 +404,7 @@ func NewTestNetworkFixture() network.TestFixture {
}
}

// ExecTxCmdWithResult executes a tx command and returns the result
func ExecTxCmdWithResult(
t *testing.T,
network *network.Network,
Expand All @@ -504,6 +424,7 @@ func ExecTxCmdWithResult(
return WaitForTx(t, network, clientCtx, txResp.TxHash)
}

// WaitForTx waits for a tx to be included in a block
func WaitForTx(
t *testing.T,
network *network.Network,
Expand Down

0 comments on commit 1b10d56

Please sign in to comment.