smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2024-12-24 23:35:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Include small improvements from v0.17.x releases in master (#1265)

Browse Source 
* add interface type checks for antehandlers

* add initial height option to test app
This commit is contained in:
Ruaridh 2022-06-06 17:07:31 +01:00 committed by GitHub
parent b0e395c148
commit 62ab9f506a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/ante/authz.go
View File

@ -8,6 +8,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/authz" "github.com/cosmos/cosmos-sdk/x/authz"
) )
var _ sdk.AnteDecorator = AuthzLimiterDecorator{}
// AuthzLimiterDecorator blocks certain msg types from being granted or executed within authz. // AuthzLimiterDecorator blocks certain msg types from being granted or executed within authz.
type AuthzLimiterDecorator struct { type AuthzLimiterDecorator struct {
// disabledMsgTypes is the type urls of the msgs to block. // disabledMsgTypes is the type urls of the msgs to block.

2
app/ante/vesting.go
View File

@ -6,6 +6,8 @@ import (
vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
) )
var _ sdk.AnteDecorator = VestingAccountDecorator{}
// VestingAccountDecorator blocks MsgCreateVestingAccount from reaching the mempool // VestingAccountDecorator blocks MsgCreateVestingAccount from reaching the mempool
type VestingAccountDecorator struct{} type VestingAccountDecorator struct{}

21
app/test_common.go
View File

@ -46,6 +46,7 @@ import (
var ( var (
emptyTime time.Time emptyTime time.Time
testChainID = "kavatest_1-1" testChainID = "kavatest_1-1"
defaultInitialHeight int64 = 1
) )
// TestApp is a simple wrapper around an App. It exposes internal keepers for use in integration tests. // TestApp is a simple wrapper around an App. It exposes internal keepers for use in integration tests.
@ -116,18 +117,27 @@ func (app *App) AppCodec() codec.Codec {
return app.appCodec return app.appCodec
} }
// InitializeFromGenesisStates calls InitChain on the app using the default genesis state, overwitten with any passed in genesis states // InitializeFromGenesisStates calls InitChain on the app using the provided genesis states.
// If any module genesis states are missing, defaults are used.
func (tApp TestApp) InitializeFromGenesisStates(genesisStates ...GenesisState) TestApp { func (tApp TestApp) InitializeFromGenesisStates(genesisStates ...GenesisState) TestApp {
return tApp.InitializeFromGenesisStatesWithTimeAndChainID(emptyTime, testChainID, genesisStates...) return tApp.InitializeFromGenesisStatesWithTimeAndChainIDAndHeight(emptyTime, testChainID, defaultInitialHeight, genesisStates...)
} }
// InitializeFromGenesisStatesWithTime calls InitChain on the app using the default genesis state, overwitten with any passed in genesis states and genesis Time // InitializeFromGenesisStatesWithTime calls InitChain on the app using the provided genesis states and time.
// If any module genesis states are missing, defaults are used.
func (tApp TestApp) InitializeFromGenesisStatesWithTime(genTime time.Time, genesisStates ...GenesisState) TestApp { func (tApp TestApp) InitializeFromGenesisStatesWithTime(genTime time.Time, genesisStates ...GenesisState) TestApp {
return tApp.InitializeFromGenesisStatesWithTimeAndChainID(genTime, testChainID, genesisStates...) return tApp.InitializeFromGenesisStatesWithTimeAndChainIDAndHeight(genTime, testChainID, defaultInitialHeight, genesisStates...)
} }
// InitializeFromGenesisStatesWithTimeAndChainID calls InitChain on the app using the default genesis state, overwitten with any passed in genesis states and genesis Time // InitializeFromGenesisStatesWithTimeAndChainID calls InitChain on the app using the provided genesis states, time, and chain id.
// If any module genesis states are missing, defaults are used.
func (tApp TestApp) InitializeFromGenesisStatesWithTimeAndChainID(genTime time.Time, chainID string, genesisStates ...GenesisState) TestApp { func (tApp TestApp) InitializeFromGenesisStatesWithTimeAndChainID(genTime time.Time, chainID string, genesisStates ...GenesisState) TestApp {
return tApp.InitializeFromGenesisStatesWithTimeAndChainIDAndHeight(genTime, chainID, defaultInitialHeight, genesisStates...)
}
// InitializeFromGenesisStatesWithTimeAndChainIDAndHeight calls InitChain on the app using the provided genesis states and other parameters.
// If any module genesis states are missing, defaults are used.
func (tApp TestApp) InitializeFromGenesisStatesWithTimeAndChainIDAndHeight(genTime time.Time, chainID string, initialHeight int64, genesisStates ...GenesisState) TestApp {
// Create a default genesis state and overwrite with provided values // Create a default genesis state and overwrite with provided values
genesisState := NewDefaultGenesisState() genesisState := NewDefaultGenesisState()
for _, state := range genesisStates { for _, state := range genesisStates {
@ -154,6 +164,7 @@ func (tApp TestApp) InitializeFromGenesisStatesWithTimeAndChainID(genTime time.T
MaxGas: 20000000, MaxGas: 20000000,
}, },
}, },
InitialHeight: initialHeight,
}, },
) )
tApp.Commit() tApp.Commit()