certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor cleanup of feeKeeper

This commit is contained in:
Ethan Buchman 2018-07-03 00:08:00 -04:00
parent 32c8993d1e
commit a6dc81defa
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/gaia/app/app.go
View File

@ -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

8
types/context.go
View File

@ -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.