diff --git a/cmd/gaia/app/app.go b/cmd/gaia/app/app.go index e557eae593..b355c4ed51 100644 --- a/cmd/gaia/app/app.go +++ b/cmd/gaia/app/app.go @@ -5,10 +5,10 @@ import ( "os" abci "github.com/tendermint/tendermint/abci/types" - tmtypes "github.com/tendermint/tendermint/types" cmn "github.com/tendermint/tendermint/libs/common" dbm "github.com/tendermint/tendermint/libs/db" "github.com/tendermint/tendermint/libs/log" + tmtypes "github.com/tendermint/tendermint/types" bam "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" @@ -68,7 +68,7 @@ func NewGaiaApp(logger log.Logger, db dbm.DB) *GaiaApp { keyStake: sdk.NewKVStoreKey("stake"), keySlashing: sdk.NewKVStoreKey("slashing"), keyGov: sdk.NewKVStoreKey("gov"), - keyFeeCollection: sdk.NewKVStoreKey("feeCollection"), + keyFeeCollection: sdk.NewKVStoreKey("fee"), } // define the accountMapper diff --git a/types/context.go b/types/context.go index b0a59520c7..e55eff1ab0 100644 --- a/types/context.go +++ b/types/context.go @@ -46,7 +46,6 @@ func NewContext(ms MultiStore, header abci.Header, isCheckTx bool, logger log.Lo c = c.WithLogger(logger) c = c.WithSigningValidators(nil) c = c.WithGasMeter(NewInfiniteGasMeter()) - c = c.WithFeeCollection(0) return c } @@ -133,7 +132,6 @@ const ( contextKeyLogger contextKeySigningValidators contextKeyGasMeter - contextKeyFeeCollector ) // NOTE: Do not expose MultiStore. @@ -168,9 +166,6 @@ func (c Context) SigningValidators() []abci.SigningValidator { func (c Context) GasMeter() GasMeter { return c.Value(contextKeyGasMeter).(GasMeter) } -func (c Context) FeeCollection() int64 { - return c.Value(contextKeyFeeCollector).(int64) -} func (c Context) WithMultiStore(ms MultiStore) Context { return c.withValue(contextKeyMultiStore, ms) } @@ -199,9 +194,6 @@ func (c Context) WithSigningValidators(SigningValidators []abci.SigningValidator func (c Context) WithGasMeter(meter GasMeter) Context { return c.withValue(contextKeyGasMeter, meter) } -func (c Context) WithFeeCollection(fee int64) Context { - return c.withValue(contextKeyFeeCollector, fee) -} // Cache the multistore and return a new cached context. The cached context is // written to the context when writeCache is called.