remove gasLimit from NewContext
This commit is contained in:
parent
3d5b048444
commit
4bdcad572b
|
@ -233,9 +233,9 @@ func (app *BaseApp) initFromStore(mainKey sdk.StoreKey) error {
|
||||||
// NewContext returns a new Context with the correct store, the given header, and nil txBytes.
|
// NewContext returns a new Context with the correct store, the given header, and nil txBytes.
|
||||||
func (app *BaseApp) NewContext(isCheckTx bool, header abci.Header) sdk.Context {
|
func (app *BaseApp) NewContext(isCheckTx bool, header abci.Header) sdk.Context {
|
||||||
if isCheckTx {
|
if isCheckTx {
|
||||||
return sdk.NewContext(app.checkState.ms, header, true, nil, app.Logger, 0)
|
return sdk.NewContext(app.checkState.ms, header, true, nil, app.Logger)
|
||||||
}
|
}
|
||||||
return sdk.NewContext(app.deliverState.ms, header, false, nil, app.Logger, 0)
|
return sdk.NewContext(app.deliverState.ms, header, false, nil, app.Logger)
|
||||||
}
|
}
|
||||||
|
|
||||||
type state struct {
|
type state struct {
|
||||||
|
@ -251,7 +251,7 @@ func (app *BaseApp) setCheckState(header abci.Header) {
|
||||||
ms := app.cms.CacheMultiStore()
|
ms := app.cms.CacheMultiStore()
|
||||||
app.checkState = &state{
|
app.checkState = &state{
|
||||||
ms: ms,
|
ms: ms,
|
||||||
ctx: sdk.NewContext(ms, header, true, nil, app.Logger, 0),
|
ctx: sdk.NewContext(ms, header, true, nil, app.Logger),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -259,7 +259,7 @@ func (app *BaseApp) setDeliverState(header abci.Header) {
|
||||||
ms := app.cms.CacheMultiStore()
|
ms := app.cms.CacheMultiStore()
|
||||||
app.deliverState = &state{
|
app.deliverState = &state{
|
||||||
ms: ms,
|
ms: ms,
|
||||||
ctx: sdk.NewContext(ms, header, false, nil, app.Logger, 0),
|
ctx: sdk.NewContext(ms, header, false, nil, app.Logger),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -324,7 +324,6 @@ func (app *BaseApp) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
|
||||||
if len(path) > 0 && path[0] == "" {
|
if len(path) > 0 && path[0] == "" {
|
||||||
path = path[1:]
|
path = path[1:]
|
||||||
}
|
}
|
||||||
fmt.Sprintf("Path: %v\n", path)
|
|
||||||
// "/app" prefix for special application queries
|
// "/app" prefix for special application queries
|
||||||
if len(path) >= 2 && path[0] == "app" {
|
if len(path) >= 2 && path[0] == "app" {
|
||||||
var result sdk.Result
|
var result sdk.Result
|
||||||
|
|
|
@ -30,7 +30,7 @@ func TestCoolKeeper(t *testing.T) {
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
am := auth.NewAccountMapper(cdc, capKey, &auth.BaseAccount{})
|
am := auth.NewAccountMapper(cdc, capKey, &auth.BaseAccount{})
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, nil, 100000)
|
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, nil)
|
||||||
ck := bank.NewKeeper(am)
|
ck := bank.NewKeeper(am)
|
||||||
keeper := NewKeeper(capKey, ck, DefaultCodespace)
|
keeper := NewKeeper(capKey, ck, DefaultCodespace)
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ func TestPowHandler(t *testing.T) {
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
am := auth.NewAccountMapper(cdc, capKey, &auth.BaseAccount{})
|
am := auth.NewAccountMapper(cdc, capKey, &auth.BaseAccount{})
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger(), 1000)
|
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger())
|
||||||
config := NewConfig("pow", int64(1))
|
config := NewConfig("pow", int64(1))
|
||||||
ck := bank.NewKeeper(am)
|
ck := bank.NewKeeper(am)
|
||||||
keeper := NewKeeper(capKey, config, ck, DefaultCodespace)
|
keeper := NewKeeper(capKey, config, ck, DefaultCodespace)
|
||||||
|
|
|
@ -33,7 +33,7 @@ func TestPowKeeperGetSet(t *testing.T) {
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
am := auth.NewAccountMapper(cdc, capKey, &auth.BaseAccount{})
|
am := auth.NewAccountMapper(cdc, capKey, &auth.BaseAccount{})
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger(), 10000)
|
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger())
|
||||||
config := NewConfig("pow", int64(1))
|
config := NewConfig("pow", int64(1))
|
||||||
ck := bank.NewKeeper(am)
|
ck := bank.NewKeeper(am)
|
||||||
keeper := NewKeeper(capKey, config, ck, DefaultCodespace)
|
keeper := NewKeeper(capKey, config, ck, DefaultCodespace)
|
||||||
|
|
|
@ -33,7 +33,7 @@ func setupMultiStore() (sdk.MultiStore, *sdk.KVStoreKey, *sdk.KVStoreKey) {
|
||||||
func TestKeeperGetSet(t *testing.T) {
|
func TestKeeperGetSet(t *testing.T) {
|
||||||
ms, _, capKey := setupMultiStore()
|
ms, _, capKey := setupMultiStore()
|
||||||
|
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger(), 100000)
|
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger())
|
||||||
stakeKeeper := NewKeeper(capKey, bank.NewKeeper(nil), DefaultCodespace)
|
stakeKeeper := NewKeeper(capKey, bank.NewKeeper(nil), DefaultCodespace)
|
||||||
addr := sdk.Address([]byte("some-address"))
|
addr := sdk.Address([]byte("some-address"))
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ func TestBonding(t *testing.T) {
|
||||||
cdc := wire.NewCodec()
|
cdc := wire.NewCodec()
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger(), 100000)
|
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger())
|
||||||
|
|
||||||
accountMapper := auth.NewAccountMapper(cdc, authKey, &auth.BaseAccount{})
|
accountMapper := auth.NewAccountMapper(cdc, authKey, &auth.BaseAccount{})
|
||||||
coinKeeper := bank.NewKeeper(accountMapper)
|
coinKeeper := bank.NewKeeper(accountMapper)
|
||||||
|
|
|
@ -30,7 +30,7 @@ type Context struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
// create a new context
|
// create a new context
|
||||||
func NewContext(ms MultiStore, header abci.Header, isCheckTx bool, txBytes []byte, logger log.Logger, gasLimit Gas) Context {
|
func NewContext(ms MultiStore, header abci.Header, isCheckTx bool, txBytes []byte, logger log.Logger) Context {
|
||||||
c := Context{
|
c := Context{
|
||||||
Context: context.Background(),
|
Context: context.Background(),
|
||||||
pst: newThePast(),
|
pst: newThePast(),
|
||||||
|
|
|
@ -43,7 +43,7 @@ func (l MockLogger) With(kvs ...interface{}) log.Logger {
|
||||||
|
|
||||||
func TestContextGetOpShouldNeverPanic(t *testing.T) {
|
func TestContextGetOpShouldNeverPanic(t *testing.T) {
|
||||||
var ms types.MultiStore
|
var ms types.MultiStore
|
||||||
ctx := types.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger(), 10000)
|
ctx := types.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger())
|
||||||
indices := []int64{
|
indices := []int64{
|
||||||
-10, 1, 0, 10, 20,
|
-10, 1, 0, 10, 20,
|
||||||
}
|
}
|
||||||
|
@ -58,7 +58,7 @@ func defaultContext(key types.StoreKey) types.Context {
|
||||||
cms := store.NewCommitMultiStore(db)
|
cms := store.NewCommitMultiStore(db)
|
||||||
cms.MountStoreWithDB(key, types.StoreTypeIAVL, db)
|
cms.MountStoreWithDB(key, types.StoreTypeIAVL, db)
|
||||||
cms.LoadLatestVersion()
|
cms.LoadLatestVersion()
|
||||||
ctx := types.NewContext(cms, abci.Header{}, false, nil, log.NewNopLogger(), 10000)
|
ctx := types.NewContext(cms, abci.Header{}, false, nil, log.NewNopLogger())
|
||||||
return ctx
|
return ctx
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ func defaultComponents(key sdk.StoreKey) (sdk.Context, *wire.Codec) {
|
||||||
cms := store.NewCommitMultiStore(db)
|
cms := store.NewCommitMultiStore(db)
|
||||||
cms.MountStoreWithDB(key, sdk.StoreTypeIAVL, db)
|
cms.MountStoreWithDB(key, sdk.StoreTypeIAVL, db)
|
||||||
cms.LoadLatestVersion()
|
cms.LoadLatestVersion()
|
||||||
ctx := sdk.NewContext(cms, abci.Header{}, false, nil, log.NewNopLogger(), 10000)
|
ctx := sdk.NewContext(cms, abci.Header{}, false, nil, log.NewNopLogger())
|
||||||
cdc := wire.NewCodec()
|
cdc := wire.NewCodec()
|
||||||
return ctx, cdc
|
return ctx, cdc
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,7 +74,7 @@ func TestAnteHandlerSigErrors(t *testing.T) {
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, &BaseAccount{})
|
mapper := NewAccountMapper(cdc, capKey, &BaseAccount{})
|
||||||
anteHandler := NewAnteHandler(mapper, BurnFeeHandler)
|
anteHandler := NewAnteHandler(mapper, BurnFeeHandler)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, nil, log.NewNopLogger(), 100000)
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, nil, log.NewNopLogger())
|
||||||
|
|
||||||
// keys and addresses
|
// keys and addresses
|
||||||
priv1, addr1 := privAndAddr()
|
priv1, addr1 := privAndAddr()
|
||||||
|
@ -115,7 +115,7 @@ func TestAnteHandlerSequences(t *testing.T) {
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, &BaseAccount{})
|
mapper := NewAccountMapper(cdc, capKey, &BaseAccount{})
|
||||||
anteHandler := NewAnteHandler(mapper, BurnFeeHandler)
|
anteHandler := NewAnteHandler(mapper, BurnFeeHandler)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, nil, log.NewNopLogger(), 1000000)
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, nil, log.NewNopLogger())
|
||||||
|
|
||||||
// keys and addresses
|
// keys and addresses
|
||||||
priv1, addr1 := privAndAddr()
|
priv1, addr1 := privAndAddr()
|
||||||
|
@ -181,7 +181,7 @@ func TestAnteHandlerFees(t *testing.T) {
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, &BaseAccount{})
|
mapper := NewAccountMapper(cdc, capKey, &BaseAccount{})
|
||||||
anteHandler := NewAnteHandler(mapper, BurnFeeHandler)
|
anteHandler := NewAnteHandler(mapper, BurnFeeHandler)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, nil, log.NewNopLogger(), 10000)
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, nil, log.NewNopLogger())
|
||||||
|
|
||||||
// keys and addresses
|
// keys and addresses
|
||||||
priv1, addr1 := privAndAddr()
|
priv1, addr1 := privAndAddr()
|
||||||
|
@ -218,7 +218,7 @@ func TestAnteHandlerBadSignBytes(t *testing.T) {
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, &BaseAccount{})
|
mapper := NewAccountMapper(cdc, capKey, &BaseAccount{})
|
||||||
anteHandler := NewAnteHandler(mapper, BurnFeeHandler)
|
anteHandler := NewAnteHandler(mapper, BurnFeeHandler)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, nil, log.NewNopLogger(), 10000)
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, nil, log.NewNopLogger())
|
||||||
|
|
||||||
// keys and addresses
|
// keys and addresses
|
||||||
priv1, addr1 := privAndAddr()
|
priv1, addr1 := privAndAddr()
|
||||||
|
@ -293,7 +293,7 @@ func TestAnteHandlerSetPubKey(t *testing.T) {
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, &BaseAccount{})
|
mapper := NewAccountMapper(cdc, capKey, &BaseAccount{})
|
||||||
anteHandler := NewAnteHandler(mapper, BurnFeeHandler)
|
anteHandler := NewAnteHandler(mapper, BurnFeeHandler)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, nil, log.NewNopLogger(), 100000)
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, nil, log.NewNopLogger())
|
||||||
|
|
||||||
// keys and addresses
|
// keys and addresses
|
||||||
priv1, addr1 := privAndAddr()
|
priv1, addr1 := privAndAddr()
|
||||||
|
|
|
@ -13,7 +13,7 @@ import (
|
||||||
|
|
||||||
func TestContextWithSigners(t *testing.T) {
|
func TestContextWithSigners(t *testing.T) {
|
||||||
ms, _ := setupMultiStore()
|
ms, _ := setupMultiStore()
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, nil, log.NewNopLogger(), 1000000)
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, nil, log.NewNopLogger())
|
||||||
|
|
||||||
_, _, addr1 := keyPubAddr()
|
_, _, addr1 := keyPubAddr()
|
||||||
_, _, addr2 := keyPubAddr()
|
_, _, addr2 := keyPubAddr()
|
||||||
|
|
|
@ -29,7 +29,7 @@ func TestAccountMapperGetSet(t *testing.T) {
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
// make context and mapper
|
// make context and mapper
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger(), 1000000)
|
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger())
|
||||||
mapper := NewAccountMapper(cdc, capKey, &BaseAccount{})
|
mapper := NewAccountMapper(cdc, capKey, &BaseAccount{})
|
||||||
|
|
||||||
addr := sdk.Address([]byte("some-address"))
|
addr := sdk.Address([]byte("some-address"))
|
||||||
|
|
|
@ -31,7 +31,7 @@ func TestKeeper(t *testing.T) {
|
||||||
cdc := wire.NewCodec()
|
cdc := wire.NewCodec()
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger(), 100000)
|
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger())
|
||||||
accountMapper := auth.NewAccountMapper(cdc, authKey, &auth.BaseAccount{})
|
accountMapper := auth.NewAccountMapper(cdc, authKey, &auth.BaseAccount{})
|
||||||
coinKeeper := NewKeeper(accountMapper)
|
coinKeeper := NewKeeper(accountMapper)
|
||||||
|
|
||||||
|
@ -116,7 +116,7 @@ func TestSendKeeper(t *testing.T) {
|
||||||
cdc := wire.NewCodec()
|
cdc := wire.NewCodec()
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger(), 100000)
|
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger())
|
||||||
accountMapper := auth.NewAccountMapper(cdc, authKey, &auth.BaseAccount{})
|
accountMapper := auth.NewAccountMapper(cdc, authKey, &auth.BaseAccount{})
|
||||||
coinKeeper := NewKeeper(accountMapper)
|
coinKeeper := NewKeeper(accountMapper)
|
||||||
sendKeeper := NewSendKeeper(accountMapper)
|
sendKeeper := NewSendKeeper(accountMapper)
|
||||||
|
@ -185,7 +185,7 @@ func TestViewKeeper(t *testing.T) {
|
||||||
cdc := wire.NewCodec()
|
cdc := wire.NewCodec()
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger(), 10000)
|
ctx := sdk.NewContext(ms, abci.Header{}, false, nil, log.NewNopLogger())
|
||||||
accountMapper := auth.NewAccountMapper(cdc, authKey, &auth.BaseAccount{})
|
accountMapper := auth.NewAccountMapper(cdc, authKey, &auth.BaseAccount{})
|
||||||
coinKeeper := NewKeeper(accountMapper)
|
coinKeeper := NewKeeper(accountMapper)
|
||||||
viewKeeper := NewViewKeeper(accountMapper)
|
viewKeeper := NewViewKeeper(accountMapper)
|
||||||
|
|
|
@ -24,7 +24,7 @@ func defaultContext(key sdk.StoreKey) sdk.Context {
|
||||||
cms := store.NewCommitMultiStore(db)
|
cms := store.NewCommitMultiStore(db)
|
||||||
cms.MountStoreWithDB(key, sdk.StoreTypeIAVL, db)
|
cms.MountStoreWithDB(key, sdk.StoreTypeIAVL, db)
|
||||||
cms.LoadLatestVersion()
|
cms.LoadLatestVersion()
|
||||||
ctx := sdk.NewContext(cms, abci.Header{}, false, nil, log.NewNopLogger(), 10000)
|
ctx := sdk.NewContext(cms, abci.Header{}, false, nil, log.NewNopLogger())
|
||||||
return ctx
|
return ctx
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -158,7 +158,7 @@ func createTestInput(t *testing.T, isCheckTx bool, initCoins int64) (sdk.Context
|
||||||
err := ms.LoadLatestVersion()
|
err := ms.LoadLatestVersion()
|
||||||
require.Nil(t, err)
|
require.Nil(t, err)
|
||||||
|
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "foochainid"}, isCheckTx, nil, log.NewNopLogger(), 100000000)
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "foochainid"}, isCheckTx, nil, log.NewNopLogger())
|
||||||
cdc := makeTestCodec()
|
cdc := makeTestCodec()
|
||||||
accountMapper := auth.NewAccountMapper(
|
accountMapper := auth.NewAccountMapper(
|
||||||
cdc, // amino codec
|
cdc, // amino codec
|
||||||
|
|
Loading…
Reference in New Issue