Skip to content

Commit ecb9554

Browse files
faddatMSalopek
faddat
authored and
MSalopek
committed
Remove spm (#812)
* successful spm removal * add app params * fix codec/marshaler
1 parent ee1afa4 commit ecb9554

File tree

25 files changed

+1675
-2441
lines changed

25 files changed

+1675
-2441
lines changed

‎app/consumer-democracy/ante/forbidden_proposals_ante_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ import (
1111
app "github.com/cosmos/interchain-security/app/consumer-democracy"
1212
"github.com/cosmos/interchain-security/app/consumer-democracy/ante"
1313
"github.com/stretchr/testify/require"
14-
"github.com/tendermint/spm/cosmoscmd"
1514
)
1615

1716
func TestForbiddenProposalsDecorator(t *testing.T) {
18-
txCfg := cosmoscmd.MakeEncodingConfig(app.ModuleBasics).TxConfig
17+
txCfg := app.MakeTestEncodingConfig().TxConfig
1918

2019
testCases := []struct {
2120
name string

‎app/consumer-democracy/app.go

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import (
88
"os"
99
"path/filepath"
1010

11+
appparams "github.com/cosmos/interchain-security/app/params"
12+
1113
"github.com/cosmos/cosmos-sdk/baseapp"
1214
"github.com/cosmos/cosmos-sdk/client"
1315
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
@@ -18,6 +20,7 @@ import (
1820
"github.com/cosmos/cosmos-sdk/server/config"
1921
servertypes "github.com/cosmos/cosmos-sdk/server/types"
2022
"github.com/cosmos/cosmos-sdk/simapp"
23+
"github.com/cosmos/cosmos-sdk/std"
2124
store "github.com/cosmos/cosmos-sdk/store/types"
2225
sdk "github.com/cosmos/cosmos-sdk/types"
2326
"github.com/cosmos/cosmos-sdk/types/module"
@@ -74,7 +77,6 @@ import (
7477
"github.com/gorilla/mux"
7578
"github.com/rakyll/statik/fs"
7679
"github.com/spf13/cast"
77-
"github.com/tendermint/spm/cosmoscmd"
7880
abci "github.com/tendermint/tendermint/abci/types"
7981
tmjson "github.com/tendermint/tendermint/libs/json"
8082
"github.com/tendermint/tendermint/libs/log"
@@ -166,7 +168,6 @@ var (
166168
var (
167169
_ simapp.App = (*App)(nil)
168170
_ servertypes.Application = (*App)(nil)
169-
_ cosmoscmd.CosmosApp = (*App)(nil)
170171
_ ibctesting.TestingApp = (*App)(nil)
171172
)
172173

@@ -236,10 +237,10 @@ func New(
236237
skipUpgradeHeights map[int64]bool,
237238
homePath string,
238239
invCheckPeriod uint,
239-
encodingConfig cosmoscmd.EncodingConfig,
240+
encodingConfig appparams.EncodingConfig,
240241
appOpts servertypes.AppOptions,
241242
baseAppOptions ...func(*baseapp.BaseApp),
242-
) cosmoscmd.App {
243+
) *App {
243244

244245
appCodec := encodingConfig.Marshaler
245246
legacyAmino := encodingConfig.Amino
@@ -830,7 +831,7 @@ func (app *App) GetScopedIBCKeeper() capabilitykeeper.ScopedKeeper {
830831

831832
// GetTxConfig implements the TestingApp interface.
832833
func (app *App) GetTxConfig() client.TxConfig {
833-
return cosmoscmd.MakeEncodingConfig(ModuleBasics).TxConfig
834+
return MakeTestEncodingConfig().TxConfig
834835
}
835836

836837
// RegisterAPIRoutes registers all application module routes with the provided
@@ -903,3 +904,16 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
903904

904905
return paramsKeeper
905906
}
907+
908+
// MakeTestEncodingConfig creates an EncodingConfig for testing. This function
909+
// should be used only in tests or when creating a new app instance (NewApp*()).
910+
// App user shouldn't create new codecs - use the app.AppCodec instead.
911+
// [DEPRECATED]
912+
func MakeTestEncodingConfig() appparams.EncodingConfig {
913+
encodingConfig := appparams.MakeTestEncodingConfig()
914+
std.RegisterLegacyAminoCodec(encodingConfig.Amino)
915+
std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
916+
ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
917+
ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
918+
return encodingConfig
919+
}

‎app/consumer/ante/disabled_modules_ante_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@ import (
88
evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
99
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
1010
ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
11-
appconsumer "github.com/cosmos/interchain-security/app/consumer"
1211
"github.com/cosmos/interchain-security/app/consumer/ante"
12+
"github.com/cosmos/interchain-security/app/params"
1313
"github.com/stretchr/testify/require"
14-
"github.com/tendermint/spm/cosmoscmd"
1514
)
1615

1716
func TestDisabledModulesDecorator(t *testing.T) {
18-
txCfg := cosmoscmd.MakeEncodingConfig(appconsumer.ModuleBasics).TxConfig
17+
txCfg := params.MakeTestEncodingConfig().TxConfig
1918

2019
testCases := []struct {
2120
name string

‎app/consumer/ante/msg_filter_ante_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ import (
66
sdk "github.com/cosmos/cosmos-sdk/types"
77
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
88
ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
9-
appconsumer "github.com/cosmos/interchain-security/app/consumer"
109
"github.com/cosmos/interchain-security/app/consumer/ante"
10+
"github.com/cosmos/interchain-security/app/params"
1111
"github.com/stretchr/testify/require"
12-
"github.com/tendermint/spm/cosmoscmd"
1312
)
1413

1514
type consumerKeeper struct {
@@ -27,7 +26,7 @@ func noOpAnteDecorator() sdk.AnteHandler {
2726
}
2827

2928
func TestMsgFilterDecorator(t *testing.T) {
30-
txCfg := cosmoscmd.MakeEncodingConfig(appconsumer.ModuleBasics).TxConfig
29+
txCfg := params.MakeTestEncodingConfig().TxConfig
3130

3231
testCases := []struct {
3332
name string

‎app/consumer/app.go

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/cosmos/cosmos-sdk/server/config"
1919
servertypes "github.com/cosmos/cosmos-sdk/server/types"
2020
"github.com/cosmos/cosmos-sdk/simapp"
21+
"github.com/cosmos/cosmos-sdk/std"
2122
store "github.com/cosmos/cosmos-sdk/store/types"
2223
sdk "github.com/cosmos/cosmos-sdk/types"
2324
"github.com/cosmos/cosmos-sdk/types/module"
@@ -66,12 +67,12 @@ import (
6667
porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
6768
ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
6869
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
70+
appparams "github.com/cosmos/interchain-security/app/params"
6971
ibctestingcore "github.com/cosmos/interchain-security/legacy_ibc_testing/core"
7072
ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"
7173
"github.com/gorilla/mux"
7274
"github.com/rakyll/statik/fs"
7375
"github.com/spf13/cast"
74-
"github.com/tendermint/spm/cosmoscmd"
7576
abci "github.com/tendermint/tendermint/abci/types"
7677
tmjson "github.com/tendermint/tendermint/libs/json"
7778
"github.com/tendermint/tendermint/libs/log"
@@ -130,7 +131,6 @@ var (
130131
var (
131132
_ simapp.App = (*App)(nil)
132133
_ servertypes.Application = (*App)(nil)
133-
_ cosmoscmd.CosmosApp = (*App)(nil)
134134
_ ibctesting.TestingApp = (*App)(nil)
135135
)
136136

@@ -201,10 +201,10 @@ func New(
201201
skipUpgradeHeights map[int64]bool,
202202
homePath string,
203203
invCheckPeriod uint,
204-
encodingConfig cosmoscmd.EncodingConfig,
204+
encodingConfig appparams.EncodingConfig,
205205
appOpts servertypes.AppOptions,
206206
baseAppOptions ...func(*baseapp.BaseApp),
207-
) cosmoscmd.App {
207+
) *App {
208208

209209
appCodec := encodingConfig.Marshaler
210210
legacyAmino := encodingConfig.Amino
@@ -698,7 +698,7 @@ func (app *App) GetScopedIBCKeeper() capabilitykeeper.ScopedKeeper {
698698

699699
// GetTxConfig implements the TestingApp interface.
700700
func (app *App) GetTxConfig() client.TxConfig {
701-
return cosmoscmd.MakeEncodingConfig(ModuleBasics).TxConfig
701+
return MakeTestEncodingConfig().TxConfig
702702
}
703703

704704
// RegisterAPIRoutes registers all application module routes with the provided
@@ -767,3 +767,16 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
767767

768768
return paramsKeeper
769769
}
770+
771+
// MakeTestEncodingConfig creates an EncodingConfig for testing. This function
772+
// should be used only in tests or when creating a new app instance (NewApp*()).
773+
// App user shouldn't create new codecs - use the app.AppCodec instead.
774+
// [DEPRECATED]
775+
func MakeTestEncodingConfig() appparams.EncodingConfig {
776+
encodingConfig := appparams.MakeTestEncodingConfig()
777+
std.RegisterLegacyAminoCodec(encodingConfig.Amino)
778+
std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
779+
ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
780+
ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
781+
return encodingConfig
782+
}

‎app/params/config.go

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package params
2+
3+
import (
4+
sdk "github.com/cosmos/cosmos-sdk/types"
5+
)
6+
7+
var (
8+
Bech32Prefix = "cosmos"
9+
10+
// Bech32PrefixAccAddr defines the Bech32 prefix of an account's address
11+
Bech32PrefixAccAddr = Bech32Prefix
12+
// Bech32PrefixAccPub defines the Bech32 prefix of an account's public key
13+
Bech32PrefixAccPub = Bech32Prefix + sdk.PrefixPublic
14+
// Bech32PrefixValAddr defines the Bech32 prefix of a validator's operator address
15+
Bech32PrefixValAddr = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixOperator
16+
// Bech32PrefixValPub defines the Bech32 prefix of a validator's operator public key
17+
Bech32PrefixValPub = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixOperator + sdk.PrefixPublic
18+
// Bech32PrefixConsAddr defines the Bech32 prefix of a consensus node address
19+
Bech32PrefixConsAddr = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixConsensus
20+
// Bech32PrefixConsPub defines the Bech32 prefix of a consensus node public key
21+
Bech32PrefixConsPub = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixConsensus + sdk.PrefixPublic
22+
)
23+
24+
// SetAddressPrefixes builds the Config with Bech32 addressPrefix and publKeyPrefix for accounts, validators, and consensus nodes and verifies that addreeses have correct format.
25+
// Not sealed yet
26+
func SetAddressPrefixes() {
27+
cfg := sdk.GetConfig()
28+
cfg.SetBech32PrefixForAccount(Bech32PrefixAccAddr, Bech32PrefixAccPub)
29+
cfg.SetBech32PrefixForValidator(Bech32PrefixValAddr, Bech32PrefixValPub)
30+
cfg.SetBech32PrefixForConsensusNode(Bech32PrefixConsAddr, Bech32PrefixConsPub)
31+
}
32+
33+
func init() {
34+
SetAddressPrefixes()
35+
}

‎app/params/doc.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
Package params defines the simulation parameters in the gaia.
3+
4+
It contains the default weights used for each transaction used on the module's
5+
simulation. These weights define the chance for a transaction to be simulated at
6+
any gived operation.
7+
8+
You can repace the default values for the weights by providing a params.json
9+
file with the weights defined for each of the transaction operations:
10+
11+
{
12+
"op_weight_msg_send": 60,
13+
"op_weight_msg_delegate": 100,
14+
}
15+
16+
In the example above, the `MsgSend` has 60% chance to be simulated, while the
17+
`MsgDelegate` will always be simulated.
18+
*/
19+
package params

‎app/params/encoding.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package params
2+
3+
import (
4+
"github.com/cosmos/cosmos-sdk/client"
5+
"github.com/cosmos/cosmos-sdk/codec"
6+
"github.com/cosmos/cosmos-sdk/codec/types"
7+
)
8+
9+
// EncodingConfig specifies the concrete encoding types to use for a given app.
10+
// This is provided for compatibility between protobuf and amino implementations.
11+
type EncodingConfig struct {
12+
InterfaceRegistry types.InterfaceRegistry
13+
Marshaler codec.Codec
14+
TxConfig client.TxConfig
15+
Amino *codec.LegacyAmino
16+
}

‎app/params/params.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package params
2+
3+
// Simulation parameter constants
4+
const (
5+
StakePerAccount = "stake_per_account"
6+
InitiallyBondedValidators = "initially_bonded_validators"
7+
)

‎app/params/proto.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package params
2+
3+
import (
4+
"github.com/cosmos/cosmos-sdk/codec"
5+
"github.com/cosmos/cosmos-sdk/codec/types"
6+
"github.com/cosmos/cosmos-sdk/x/auth/tx"
7+
)
8+
9+
// MakeTestEncodingConfig creates an EncodingConfig for an amino based test configuration.
10+
func MakeTestEncodingConfig() EncodingConfig {
11+
amino := codec.NewLegacyAmino()
12+
interfaceRegistry := types.NewInterfaceRegistry()
13+
chainCodec := codec.NewProtoCodec(interfaceRegistry)
14+
txCfg := tx.NewTxConfig(chainCodec, tx.DefaultSignModes)
15+
16+
return EncodingConfig{
17+
InterfaceRegistry: interfaceRegistry,
18+
Marshaler: chainCodec,
19+
TxConfig: txCfg,
20+
Amino: amino,
21+
}
22+
}

‎app/params/weights.go

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package params
2+
3+
// Default simulation operation weights for messages and gov proposals
4+
const (
5+
DefaultWeightMsgSend int = 100
6+
DefaultWeightMsgMultiSend int = 10
7+
DefaultWeightMsgSetWithdrawAddress int = 50
8+
DefaultWeightMsgWithdrawDelegationReward int = 50
9+
DefaultWeightMsgWithdrawValidatorCommission int = 50
10+
DefaultWeightMsgFundCommunityPool int = 50
11+
DefaultWeightMsgDeposit int = 100
12+
DefaultWeightMsgVote int = 67
13+
DefaultWeightMsgUnjail int = 100
14+
DefaultWeightMsgCreateValidator int = 100
15+
DefaultWeightMsgEditValidator int = 5
16+
DefaultWeightMsgDelegate int = 100
17+
DefaultWeightMsgUndelegate int = 100
18+
DefaultWeightMsgBeginRedelegate int = 100
19+
20+
DefaultWeightCommunitySpendProposal int = 5
21+
DefaultWeightTextProposal int = 5
22+
DefaultWeightParamChangeProposal int = 5
23+
24+
DefaultWeightMsgStoreCode int = 50
25+
DefaultWeightMsgInstantiateContract int = 100
26+
DefaultWeightMsgExecuteContract int = 100
27+
DefaultWeightMsgUpdateAdmin int = 25
28+
DefaultWeightMsgClearAdmin int = 10
29+
DefaultWeightMsgMigrateContract int = 50
30+
31+
DefaultWeightStoreCodeProposal int = 5
32+
DefaultWeightInstantiateContractProposal int = 5
33+
DefaultWeightUpdateAdminProposal int = 5
34+
DefaultWeightExecuteContractProposal int = 5
35+
DefaultWeightClearAdminProposal int = 5
36+
DefaultWeightMigrateContractProposal int = 5
37+
DefaultWeightSudoContractProposal int = 5
38+
DefaultWeightPinCodesProposal int = 5
39+
DefaultWeightUnpinCodesProposal int = 5
40+
DefaultWeightUpdateInstantiateConfigProposal int = 5
41+
DefaultWeightStoreAndInstantiateContractProposal int = 5
42+
)

0 commit comments

Comments
 (0)