Merge PR #2545: Rename AccountMapper to AccountKeeper
This commit is contained in:
commit
3e22a36c5e
|
@ -85,6 +85,7 @@ BREAKING CHANGES
|
||||||
* [x/stake] \#2508 Utilize Tendermint power for validator power key
|
* [x/stake] \#2508 Utilize Tendermint power for validator power key
|
||||||
* [x/stake] \#2531 Remove all inflation logic
|
* [x/stake] \#2531 Remove all inflation logic
|
||||||
* [x/mint] \#2531 Add minting module and inflation logic
|
* [x/mint] \#2531 Add minting module and inflation logic
|
||||||
|
* [x/auth] [\#2540](https://github.com/cosmos/cosmos-sdk/issues/2540) Rename `AccountMapper` to `AccountKeeper`.
|
||||||
|
|
||||||
* Tendermint
|
* Tendermint
|
||||||
* Update tendermint version from v0.23.0 to v0.25.0, notable changes
|
* Update tendermint version from v0.23.0 to v0.25.0, notable changes
|
||||||
|
|
|
@ -56,7 +56,7 @@ type GaiaApp struct {
|
||||||
tkeyParams *sdk.TransientStoreKey
|
tkeyParams *sdk.TransientStoreKey
|
||||||
|
|
||||||
// Manage getting and setting accounts
|
// Manage getting and setting accounts
|
||||||
accountMapper auth.AccountMapper
|
accountKeeper auth.AccountKeeper
|
||||||
feeCollectionKeeper auth.FeeCollectionKeeper
|
feeCollectionKeeper auth.FeeCollectionKeeper
|
||||||
bankKeeper bank.Keeper
|
bankKeeper bank.Keeper
|
||||||
stakeKeeper stake.Keeper
|
stakeKeeper stake.Keeper
|
||||||
|
@ -91,15 +91,15 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio
|
||||||
tkeyParams: sdk.NewTransientStoreKey("transient_params"),
|
tkeyParams: sdk.NewTransientStoreKey("transient_params"),
|
||||||
}
|
}
|
||||||
|
|
||||||
// define the accountMapper
|
// define the accountKeeper
|
||||||
app.accountMapper = auth.NewAccountMapper(
|
app.accountKeeper = auth.NewAccountKeeper(
|
||||||
app.cdc,
|
app.cdc,
|
||||||
app.keyAccount, // target store
|
app.keyAccount, // target store
|
||||||
auth.ProtoBaseAccount, // prototype
|
auth.ProtoBaseAccount, // prototype
|
||||||
)
|
)
|
||||||
|
|
||||||
// add handlers
|
// add handlers
|
||||||
app.bankKeeper = bank.NewBaseKeeper(app.accountMapper)
|
app.bankKeeper = bank.NewBaseKeeper(app.accountKeeper)
|
||||||
app.feeCollectionKeeper = auth.NewFeeCollectionKeeper(
|
app.feeCollectionKeeper = auth.NewFeeCollectionKeeper(
|
||||||
app.cdc,
|
app.cdc,
|
||||||
app.keyFeeCollection,
|
app.keyFeeCollection,
|
||||||
|
@ -159,7 +159,7 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio
|
||||||
app.keySlashing, app.keyGov, app.keyFeeCollection, app.keyParams)
|
app.keySlashing, app.keyGov, app.keyFeeCollection, app.keyParams)
|
||||||
app.SetInitChainer(app.initChainer)
|
app.SetInitChainer(app.initChainer)
|
||||||
app.SetBeginBlocker(app.BeginBlocker)
|
app.SetBeginBlocker(app.BeginBlocker)
|
||||||
app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper, app.feeCollectionKeeper))
|
app.SetAnteHandler(auth.NewAnteHandler(app.accountKeeper, app.feeCollectionKeeper))
|
||||||
app.MountStoresTransient(app.tkeyParams, app.tkeyStake, app.tkeyDistr)
|
app.MountStoresTransient(app.tkeyParams, app.tkeyStake, app.tkeyDistr)
|
||||||
app.SetEndBlocker(app.EndBlocker)
|
app.SetEndBlocker(app.EndBlocker)
|
||||||
|
|
||||||
|
@ -231,8 +231,8 @@ func (app *GaiaApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci
|
||||||
// load the accounts
|
// load the accounts
|
||||||
for _, gacc := range genesisState.Accounts {
|
for _, gacc := range genesisState.Accounts {
|
||||||
acc := gacc.ToAccount()
|
acc := gacc.ToAccount()
|
||||||
acc.AccountNumber = app.accountMapper.GetNextAccountNumber(ctx)
|
acc.AccountNumber = app.accountKeeper.GetNextAccountNumber(ctx)
|
||||||
app.accountMapper.SetAccount(ctx, acc)
|
app.accountKeeper.SetAccount(ctx, acc)
|
||||||
}
|
}
|
||||||
|
|
||||||
// load the initial stake information
|
// load the initial stake information
|
||||||
|
@ -299,7 +299,7 @@ func (app *GaiaApp) ExportAppStateAndValidators() (appState json.RawMessage, val
|
||||||
accounts = append(accounts, account)
|
accounts = append(accounts, account)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
app.accountMapper.IterateAccounts(ctx, appendAccount)
|
app.accountKeeper.IterateAccounts(ctx, appendAccount)
|
||||||
genState := NewGenesisState(
|
genState := NewGenesisState(
|
||||||
accounts,
|
accounts,
|
||||||
stake.WriteGenesis(ctx, app.stakeKeeper),
|
stake.WriteGenesis(ctx, app.stakeKeeper),
|
||||||
|
|
|
@ -106,23 +106,23 @@ func appStateFn(r *rand.Rand, accs []simulation.Account) json.RawMessage {
|
||||||
|
|
||||||
func testAndRunTxs(app *GaiaApp) []simulation.WeightedOperation {
|
func testAndRunTxs(app *GaiaApp) []simulation.WeightedOperation {
|
||||||
return []simulation.WeightedOperation{
|
return []simulation.WeightedOperation{
|
||||||
{100, banksim.SingleInputSendMsg(app.accountMapper, app.bankKeeper)},
|
{100, banksim.SingleInputSendMsg(app.accountKeeper, app.bankKeeper)},
|
||||||
{5, govsim.SimulateSubmittingVotingAndSlashingForProposal(app.govKeeper, app.stakeKeeper)},
|
{5, govsim.SimulateSubmittingVotingAndSlashingForProposal(app.govKeeper, app.stakeKeeper)},
|
||||||
{100, govsim.SimulateMsgDeposit(app.govKeeper, app.stakeKeeper)},
|
{100, govsim.SimulateMsgDeposit(app.govKeeper, app.stakeKeeper)},
|
||||||
{100, stakesim.SimulateMsgCreateValidator(app.accountMapper, app.stakeKeeper)},
|
{100, stakesim.SimulateMsgCreateValidator(app.accountKeeper, app.stakeKeeper)},
|
||||||
{5, stakesim.SimulateMsgEditValidator(app.stakeKeeper)},
|
{5, stakesim.SimulateMsgEditValidator(app.stakeKeeper)},
|
||||||
{100, stakesim.SimulateMsgDelegate(app.accountMapper, app.stakeKeeper)},
|
{100, stakesim.SimulateMsgDelegate(app.accountKeeper, app.stakeKeeper)},
|
||||||
{100, stakesim.SimulateMsgBeginUnbonding(app.accountMapper, app.stakeKeeper)},
|
{100, stakesim.SimulateMsgBeginUnbonding(app.accountKeeper, app.stakeKeeper)},
|
||||||
{100, stakesim.SimulateMsgBeginRedelegate(app.accountMapper, app.stakeKeeper)},
|
{100, stakesim.SimulateMsgBeginRedelegate(app.accountKeeper, app.stakeKeeper)},
|
||||||
{100, slashingsim.SimulateMsgUnjail(app.slashingKeeper)},
|
{100, slashingsim.SimulateMsgUnjail(app.slashingKeeper)},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func invariants(app *GaiaApp) []simulation.Invariant {
|
func invariants(app *GaiaApp) []simulation.Invariant {
|
||||||
return []simulation.Invariant{
|
return []simulation.Invariant{
|
||||||
banksim.NonnegativeBalanceInvariant(app.accountMapper),
|
banksim.NonnegativeBalanceInvariant(app.accountKeeper),
|
||||||
govsim.AllInvariants(),
|
govsim.AllInvariants(),
|
||||||
stakesim.AllInvariants(app.bankKeeper, app.stakeKeeper, app.accountMapper),
|
stakesim.AllInvariants(app.bankKeeper, app.stakeKeeper, app.accountKeeper),
|
||||||
slashingsim.AllInvariants(),
|
slashingsim.AllInvariants(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -138,7 +138,7 @@ type GaiaApp struct {
|
||||||
tkeyParams *sdk.TransientStoreKey
|
tkeyParams *sdk.TransientStoreKey
|
||||||
|
|
||||||
// Manage getting and setting accounts
|
// Manage getting and setting accounts
|
||||||
accountMapper auth.AccountMapper
|
accountKeeper auth.AccountKeeper
|
||||||
feeCollectionKeeper auth.FeeCollectionKeeper
|
feeCollectionKeeper auth.FeeCollectionKeeper
|
||||||
bankKeeper bank.Keeper
|
bankKeeper bank.Keeper
|
||||||
stakeKeeper stake.Keeper
|
stakeKeeper stake.Keeper
|
||||||
|
@ -165,15 +165,15 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.BaseAp
|
||||||
tkeyParams: sdk.NewTransientStoreKey("transient_params"),
|
tkeyParams: sdk.NewTransientStoreKey("transient_params"),
|
||||||
}
|
}
|
||||||
|
|
||||||
// define the accountMapper
|
// define the accountKeeper
|
||||||
app.accountMapper = auth.NewAccountMapper(
|
app.accountKeeper = auth.NewAccountKeeper(
|
||||||
app.cdc,
|
app.cdc,
|
||||||
app.keyAccount, // target store
|
app.keyAccount, // target store
|
||||||
auth.ProtoBaseAccount, // prototype
|
auth.ProtoBaseAccount, // prototype
|
||||||
)
|
)
|
||||||
|
|
||||||
// add handlers
|
// add handlers
|
||||||
app.bankKeeper = bank.NewBaseKeeper(app.accountMapper)
|
app.bankKeeper = bank.NewBaseKeeper(app.accountKeeper)
|
||||||
app.paramsKeeper = params.NewKeeper(app.cdc, app.keyParams, app.tkeyParams)
|
app.paramsKeeper = params.NewKeeper(app.cdc, app.keyParams, app.tkeyParams)
|
||||||
app.stakeKeeper = stake.NewKeeper(app.cdc, app.keyStake, app.tkeyStake, app.bankKeeper, app.paramsKeeper.Subspace(stake.DefaultParamspace), app.RegisterCodespace(stake.DefaultCodespace))
|
app.stakeKeeper = stake.NewKeeper(app.cdc, app.keyStake, app.tkeyStake, app.bankKeeper, app.paramsKeeper.Subspace(stake.DefaultParamspace), app.RegisterCodespace(stake.DefaultCodespace))
|
||||||
app.slashingKeeper = slashing.NewKeeper(app.cdc, app.keySlashing, app.stakeKeeper, app.paramsKeeper.Subspace(slashing.DefaultParamspace), app.RegisterCodespace(slashing.DefaultCodespace))
|
app.slashingKeeper = slashing.NewKeeper(app.cdc, app.keySlashing, app.stakeKeeper, app.paramsKeeper.Subspace(slashing.DefaultParamspace), app.RegisterCodespace(slashing.DefaultCodespace))
|
||||||
|
@ -187,7 +187,7 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.BaseAp
|
||||||
app.SetInitChainer(app.initChainer)
|
app.SetInitChainer(app.initChainer)
|
||||||
app.SetBeginBlocker(app.BeginBlocker)
|
app.SetBeginBlocker(app.BeginBlocker)
|
||||||
app.SetEndBlocker(app.EndBlocker)
|
app.SetEndBlocker(app.EndBlocker)
|
||||||
app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper, app.feeCollectionKeeper))
|
app.SetAnteHandler(auth.NewAnteHandler(app.accountKeeper, app.feeCollectionKeeper))
|
||||||
app.MountStoresIAVL(app.keyMain, app.keyAccount, app.keyStake, app.keySlashing, app.keyParams)
|
app.MountStoresIAVL(app.keyMain, app.keyAccount, app.keyStake, app.keySlashing, app.keyParams)
|
||||||
app.MountStore(app.tkeyParams, sdk.StoreTypeTransient)
|
app.MountStore(app.tkeyParams, sdk.StoreTypeTransient)
|
||||||
err := app.LoadLatestVersion(app.keyMain)
|
err := app.LoadLatestVersion(app.keyMain)
|
||||||
|
@ -246,7 +246,7 @@ func (app *GaiaApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci
|
||||||
// load the accounts
|
// load the accounts
|
||||||
for _, gacc := range genesisState.Accounts {
|
for _, gacc := range genesisState.Accounts {
|
||||||
acc := gacc.ToAccount()
|
acc := gacc.ToAccount()
|
||||||
app.accountMapper.SetAccount(ctx, acc)
|
app.accountKeeper.SetAccount(ctx, acc)
|
||||||
}
|
}
|
||||||
|
|
||||||
// load the initial stake information
|
// load the initial stake information
|
||||||
|
|
|
@ -86,7 +86,7 @@ type BaseAccount struct {
|
||||||
|
|
||||||
It simply contains a field for each of the methods.
|
It simply contains a field for each of the methods.
|
||||||
|
|
||||||
### AccountMapper
|
### AccountKeeper
|
||||||
|
|
||||||
In previous apps using our `appAccount`, we handled
|
In previous apps using our `appAccount`, we handled
|
||||||
marshaling/unmarshaling the account from the store ourselves, by performing
|
marshaling/unmarshaling the account from the store ourselves, by performing
|
||||||
|
@ -95,36 +95,36 @@ to work with in our applications. In the SDK, we use the term `Mapper` to refer
|
||||||
to an abstaction over a KVStore that handles marshalling and unmarshalling a
|
to an abstaction over a KVStore that handles marshalling and unmarshalling a
|
||||||
particular data type to and from the underlying store.
|
particular data type to and from the underlying store.
|
||||||
|
|
||||||
The `x/auth` module provides an `AccountMapper` that allows us to get and
|
The `x/auth` module provides an `AccountKeeper` that allows us to get and
|
||||||
set `Account` types to the store. Note the benefit of using the `Account`
|
set `Account` types to the store. Note the benefit of using the `Account`
|
||||||
interface here - developers can implement their own account type that extends
|
interface here - developers can implement their own account type that extends
|
||||||
the `BaseAccount` to store additional data without requiring another lookup from
|
the `BaseAccount` to store additional data without requiring another lookup from
|
||||||
the store.
|
the store.
|
||||||
|
|
||||||
Creating an AccountMapper is easy - we just need to specify a codec, a
|
Creating an AccountKeeper is easy - we just need to specify a codec, a
|
||||||
capability key, and a prototype of the object being encoded
|
capability key, and a prototype of the object being encoded
|
||||||
|
|
||||||
```go
|
```go
|
||||||
accountMapper := auth.NewAccountMapper(cdc, keyAccount, auth.ProtoBaseAccount)
|
accountKeeper := auth.NewAccountKeeper(cdc, keyAccount, auth.ProtoBaseAccount)
|
||||||
```
|
```
|
||||||
|
|
||||||
Then we can get, modify, and set accounts. For instance, we could double the
|
Then we can get, modify, and set accounts. For instance, we could double the
|
||||||
amount of coins in an account:
|
amount of coins in an account:
|
||||||
|
|
||||||
```go
|
```go
|
||||||
acc := accountMapper.GetAccount(ctx, addr)
|
acc := accountKeeper.GetAccount(ctx, addr)
|
||||||
acc.SetCoins(acc.Coins.Plus(acc.Coins))
|
acc.SetCoins(acc.Coins.Plus(acc.Coins))
|
||||||
accountMapper.SetAccount(ctx, addr)
|
accountKeeper.SetAccount(ctx, addr)
|
||||||
```
|
```
|
||||||
|
|
||||||
Note that the `AccountMapper` takes a `Context` as the first argument, and will
|
Note that the `AccountKeeper` takes a `Context` as the first argument, and will
|
||||||
load the KVStore from there using the capability key it was granted on creation.
|
load the KVStore from there using the capability key it was granted on creation.
|
||||||
|
|
||||||
Also note that you must explicitly call `SetAccount` after mutating an account
|
Also note that you must explicitly call `SetAccount` after mutating an account
|
||||||
for the change to persist!
|
for the change to persist!
|
||||||
|
|
||||||
See the [AccountMapper API
|
See the [AccountKeeper API
|
||||||
docs](https://godoc.org/github.com/cosmos/cosmos-sdk/x/auth#AccountMapper) for more information.
|
docs](https://godoc.org/github.com/cosmos/cosmos-sdk/x/auth#AccountKeeper) for more information.
|
||||||
|
|
||||||
## StdTx
|
## StdTx
|
||||||
|
|
||||||
|
@ -224,10 +224,10 @@ all the relevant information.
|
||||||
As we saw in `App2`, we can use an `AnteHandler` to authenticate transactions
|
As we saw in `App2`, we can use an `AnteHandler` to authenticate transactions
|
||||||
before we handle any of their internal messages. While previously we implemented
|
before we handle any of their internal messages. While previously we implemented
|
||||||
our own simple `AnteHandler`, the `x/auth` module provides a much more advanced
|
our own simple `AnteHandler`, the `x/auth` module provides a much more advanced
|
||||||
one that uses `AccountMapper` and works with `StdTx`:
|
one that uses `AccountKeeper` and works with `StdTx`:
|
||||||
|
|
||||||
```go
|
```go
|
||||||
app.SetAnteHandler(auth.NewAnteHandler(accountMapper, feeKeeper))
|
app.SetAnteHandler(auth.NewAnteHandler(accountKeeper, feeKeeper))
|
||||||
```
|
```
|
||||||
|
|
||||||
The AnteHandler provided by `x/auth` enforces the following rules:
|
The AnteHandler provided by `x/auth` enforces the following rules:
|
||||||
|
@ -263,7 +263,7 @@ The fee is paid by the first address returned by `msg.GetSigners()` for the firs
|
||||||
|
|
||||||
## CoinKeeper
|
## CoinKeeper
|
||||||
|
|
||||||
Now that we've seen the `auth.AccountMapper` and how its used to build a
|
Now that we've seen the `auth.AccountKeeper` and how its used to build a
|
||||||
complete AnteHandler, it's time to look at how to build higher-level
|
complete AnteHandler, it's time to look at how to build higher-level
|
||||||
abstractions for taking action on accounts.
|
abstractions for taking action on accounts.
|
||||||
|
|
||||||
|
@ -274,26 +274,26 @@ which expose only limitted functionality on the underlying types stored by the `
|
||||||
|
|
||||||
For instance, the `x/bank` module defines the canonical versions of `MsgSend`
|
For instance, the `x/bank` module defines the canonical versions of `MsgSend`
|
||||||
and `MsgIssue` for the SDK, as well as a `Handler` for processing them. However,
|
and `MsgIssue` for the SDK, as well as a `Handler` for processing them. However,
|
||||||
rather than passing a `KVStore` or even an `AccountMapper` directly to the handler,
|
rather than passing a `KVStore` or even an `AccountKeeper` directly to the handler,
|
||||||
we introduce a `bank.Keeper`, which can only be used to transfer coins in and out of accounts.
|
we introduce a `bank.Keeper`, which can only be used to transfer coins in and out of accounts.
|
||||||
This allows us to determine up front that the only effect the bank module's
|
This allows us to determine up front that the only effect the bank module's
|
||||||
`Handler` can have on the store is to change the amount of coins in an account -
|
`Handler` can have on the store is to change the amount of coins in an account -
|
||||||
it can't increment sequence numbers, change PubKeys, or otherwise.
|
it can't increment sequence numbers, change PubKeys, or otherwise.
|
||||||
|
|
||||||
|
|
||||||
A `bank.Keeper` is easily instantiated from an `AccountMapper`:
|
A `bank.Keeper` is easily instantiated from an `AccountKeeper`:
|
||||||
|
|
||||||
```go
|
```go
|
||||||
bankKeeper = bank.NewBaseKeeper(accountMapper)
|
bankKeeper = bank.NewBaseKeeper(accountKeeper)
|
||||||
```
|
```
|
||||||
|
|
||||||
We can then use it within a handler, instead of working directly with the
|
We can then use it within a handler, instead of working directly with the
|
||||||
`AccountMapper`. For instance, to add coins to an account:
|
`AccountKeeper`. For instance, to add coins to an account:
|
||||||
|
|
||||||
```go
|
```go
|
||||||
// Finds account with addr in AccountMapper.
|
// Finds account with addr in AccountKeeper.
|
||||||
// Adds coins to account's coin array.
|
// Adds coins to account's coin array.
|
||||||
// Sets updated account in AccountMapper
|
// Sets updated account in AccountKeeper
|
||||||
app.bankKeeper.AddCoins(ctx, addr, coins)
|
app.bankKeeper.AddCoins(ctx, addr, coins)
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -311,12 +311,12 @@ accounts.
|
||||||
We use this `Keeper` paradigm extensively in the SDK as the way to define what
|
We use this `Keeper` paradigm extensively in the SDK as the way to define what
|
||||||
kind of functionality each module gets access to. In particular, we try to
|
kind of functionality each module gets access to. In particular, we try to
|
||||||
follow the *principle of least authority*.
|
follow the *principle of least authority*.
|
||||||
Rather than providing full blown access to the `KVStore` or the `AccountMapper`,
|
Rather than providing full blown access to the `KVStore` or the `AccountKeeper`,
|
||||||
we restrict access to a small number of functions that do very specific things.
|
we restrict access to a small number of functions that do very specific things.
|
||||||
|
|
||||||
## App3
|
## App3
|
||||||
|
|
||||||
With the `auth.AccountMapper` and `bank.Keeper` in hand,
|
With the `auth.AccountKeeper` and `bank.Keeper` in hand,
|
||||||
we're now ready to build `App3`.
|
we're now ready to build `App3`.
|
||||||
The `x/auth` and `x/bank` modules do all the heavy lifting:
|
The `x/auth` and `x/bank` modules do all the heavy lifting:
|
||||||
|
|
||||||
|
@ -334,11 +334,11 @@ func NewApp3(logger log.Logger, db dbm.DB) *bapp.BaseApp {
|
||||||
keyFees := sdk.NewKVStoreKey("fee") // TODO
|
keyFees := sdk.NewKVStoreKey("fee") // TODO
|
||||||
|
|
||||||
// Set various mappers/keepers to interact easily with underlying stores
|
// Set various mappers/keepers to interact easily with underlying stores
|
||||||
accountMapper := auth.NewAccountMapper(cdc, keyAccount, auth.ProtoBaseAccount)
|
accountKeeper := auth.NewAccountKeeper(cdc, keyAccount, auth.ProtoBaseAccount)
|
||||||
bankKeeper := bank.NewBaseKeeper(accountMapper)
|
bankKeeper := bank.NewBaseKeeper(accountKeeper)
|
||||||
feeKeeper := auth.NewFeeCollectionKeeper(cdc, keyFees)
|
feeKeeper := auth.NewFeeCollectionKeeper(cdc, keyFees)
|
||||||
|
|
||||||
app.SetAnteHandler(auth.NewAnteHandler(accountMapper, feeKeeper))
|
app.SetAnteHandler(auth.NewAnteHandler(accountKeeper, feeKeeper))
|
||||||
|
|
||||||
// Register message routes.
|
// Register message routes.
|
||||||
// Note the handler gets access to
|
// Note the handler gets access to
|
||||||
|
|
|
@ -30,11 +30,11 @@ func NewApp3(logger log.Logger, db dbm.DB) *bapp.BaseApp {
|
||||||
keyFees := sdk.NewKVStoreKey("fee") // TODO
|
keyFees := sdk.NewKVStoreKey("fee") // TODO
|
||||||
|
|
||||||
// Set various mappers/keepers to interact easily with underlying stores
|
// Set various mappers/keepers to interact easily with underlying stores
|
||||||
accountMapper := auth.NewAccountMapper(cdc, keyAccount, auth.ProtoBaseAccount)
|
accountKeeper := auth.NewAccountKeeper(cdc, keyAccount, auth.ProtoBaseAccount)
|
||||||
bankKeeper := bank.NewBaseKeeper(accountMapper)
|
bankKeeper := bank.NewBaseKeeper(accountKeeper)
|
||||||
feeKeeper := auth.NewFeeCollectionKeeper(cdc, keyFees)
|
feeKeeper := auth.NewFeeCollectionKeeper(cdc, keyFees)
|
||||||
|
|
||||||
app.SetAnteHandler(auth.NewAnteHandler(accountMapper, feeKeeper))
|
app.SetAnteHandler(auth.NewAnteHandler(accountKeeper, feeKeeper))
|
||||||
|
|
||||||
// Register message routes.
|
// Register message routes.
|
||||||
// Note the handler gets access to
|
// Note the handler gets access to
|
||||||
|
|
|
@ -28,17 +28,17 @@ func NewApp4(logger log.Logger, db dbm.DB) *bapp.BaseApp {
|
||||||
keyAccount := sdk.NewKVStoreKey("acc")
|
keyAccount := sdk.NewKVStoreKey("acc")
|
||||||
|
|
||||||
// Set various mappers/keepers to interact easily with underlying stores
|
// Set various mappers/keepers to interact easily with underlying stores
|
||||||
accountMapper := auth.NewAccountMapper(cdc, keyAccount, auth.ProtoBaseAccount)
|
accountKeeper := auth.NewAccountKeeper(cdc, keyAccount, auth.ProtoBaseAccount)
|
||||||
bankKeeper := bank.NewBaseKeeper(accountMapper)
|
bankKeeper := bank.NewBaseKeeper(accountKeeper)
|
||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
keyFees := sdk.NewKVStoreKey("fee")
|
keyFees := sdk.NewKVStoreKey("fee")
|
||||||
feeKeeper := auth.NewFeeCollectionKeeper(cdc, keyFees)
|
feeKeeper := auth.NewFeeCollectionKeeper(cdc, keyFees)
|
||||||
|
|
||||||
app.SetAnteHandler(auth.NewAnteHandler(accountMapper, feeKeeper))
|
app.SetAnteHandler(auth.NewAnteHandler(accountKeeper, feeKeeper))
|
||||||
|
|
||||||
// Set InitChainer
|
// Set InitChainer
|
||||||
app.SetInitChainer(NewInitChainer(cdc, accountMapper))
|
app.SetInitChainer(NewInitChainer(cdc, accountKeeper))
|
||||||
|
|
||||||
// Register message routes.
|
// Register message routes.
|
||||||
// Note the handler gets access to the account store.
|
// Note the handler gets access to the account store.
|
||||||
|
@ -76,7 +76,7 @@ func (ga *GenesisAccount) ToAccount() (acc *auth.BaseAccount, err error) {
|
||||||
|
|
||||||
// InitChainer will set initial balances for accounts as well as initial coin metadata
|
// InitChainer will set initial balances for accounts as well as initial coin metadata
|
||||||
// MsgIssue can no longer be used to create new coin
|
// MsgIssue can no longer be used to create new coin
|
||||||
func NewInitChainer(cdc *codec.Codec, accountMapper auth.AccountMapper) sdk.InitChainer {
|
func NewInitChainer(cdc *codec.Codec, accountKeeper auth.AccountKeeper) sdk.InitChainer {
|
||||||
return func(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain {
|
return func(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain {
|
||||||
stateJSON := req.AppStateBytes
|
stateJSON := req.AppStateBytes
|
||||||
|
|
||||||
|
@ -91,8 +91,8 @@ func NewInitChainer(cdc *codec.Codec, accountMapper auth.AccountMapper) sdk.Init
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
acc.AccountNumber = accountMapper.GetNextAccountNumber(ctx)
|
acc.AccountNumber = accountKeeper.GetNextAccountNumber(ctx)
|
||||||
accountMapper.SetAccount(ctx, acc)
|
accountKeeper.SetAccount(ctx, acc)
|
||||||
}
|
}
|
||||||
|
|
||||||
return abci.ResponseInitChain{}
|
return abci.ResponseInitChain{}
|
||||||
|
|
|
@ -127,7 +127,7 @@ func (app *BasecoinApp) initRouterHandlers() {
|
||||||
|
|
||||||
// All handlers must be added here.
|
// All handlers must be added here.
|
||||||
// The order matters.
|
// The order matters.
|
||||||
app.router.AddRoute("bank", bank.NewHandler(app.accountMapper))
|
app.router.AddRoute("bank", bank.NewHandler(app.accountKeeper))
|
||||||
app.router.AddRoute("sketchy", sketchy.NewHandler())
|
app.router.AddRoute("sketchy", sketchy.NewHandler())
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
|
@ -45,7 +45,7 @@ type SimpleGovApp struct {
|
||||||
simpleGovKeeper simpleGov.Keeper
|
simpleGovKeeper simpleGov.Keeper
|
||||||
|
|
||||||
// Manage getting and setting accounts
|
// Manage getting and setting accounts
|
||||||
accountMapper auth.AccountMapper
|
accountKeeper auth.AccountKeeper
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -206,7 +206,7 @@ var cdc = MakeCodec()
|
||||||
- Instantiate the keepers. Note that keepers generally need access to other module's keepers. In this case, make sure you only pass an instance of the keeper for the functionality that is needed. If a keeper only needs to read in another module's store, a read-only keeper should be passed to it.
|
- Instantiate the keepers. Note that keepers generally need access to other module's keepers. In this case, make sure you only pass an instance of the keeper for the functionality that is needed. If a keeper only needs to read in another module's store, a read-only keeper should be passed to it.
|
||||||
|
|
||||||
```go
|
```go
|
||||||
app.bankKeeper = bank.NewBaseKeeper(app.accountMapper)
|
app.bankKeeper = bank.NewBaseKeeper(app.accountKeeper)
|
||||||
app.stakeKeeper = simplestake.NewKeeper(app.capKeyStakingStore, app.bankKeeper,app.RegisterCodespace(simplestake.DefaultCodespace))
|
app.stakeKeeper = simplestake.NewKeeper(app.capKeyStakingStore, app.bankKeeper,app.RegisterCodespace(simplestake.DefaultCodespace))
|
||||||
app.simpleGovKeeper = simpleGov.NewKeeper(app.capKeySimpleGovStore, app.bankKeeper, app.stakeKeeper, app.RegisterCodespace(simpleGov.DefaultCodespace))
|
app.simpleGovKeeper = simpleGov.NewKeeper(app.capKeySimpleGovStore, app.bankKeeper, app.stakeKeeper, app.RegisterCodespace(simpleGov.DefaultCodespace))
|
||||||
```
|
```
|
||||||
|
@ -225,7 +225,7 @@ app.Router().
|
||||||
```go
|
```go
|
||||||
// Initialize BaseApp.
|
// Initialize BaseApp.
|
||||||
app.MountStoresIAVL(app.capKeyMainStore, app.capKeyAccountStore, app.capKeySimpleGovStore, app.capKeyStakingStore)
|
app.MountStoresIAVL(app.capKeyMainStore, app.capKeyAccountStore, app.capKeySimpleGovStore, app.capKeyStakingStore)
|
||||||
app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper, app.feeCollectionKeeper))
|
app.SetAnteHandler(auth.NewAnteHandler(app.accountKeeper, app.feeCollectionKeeper))
|
||||||
err := app.LoadLatestVersion(app.capKeyMainStore)
|
err := app.LoadLatestVersion(app.capKeyMainStore)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
cmn.Exit(err.Error())
|
cmn.Exit(err.Error())
|
||||||
|
|
|
@ -42,7 +42,7 @@ type BasecoinApp struct {
|
||||||
keyIBC *sdk.KVStoreKey
|
keyIBC *sdk.KVStoreKey
|
||||||
|
|
||||||
// manage getting and setting accounts
|
// manage getting and setting accounts
|
||||||
accountMapper auth.AccountMapper
|
accountKeeper auth.AccountKeeper
|
||||||
feeCollectionKeeper auth.FeeCollectionKeeper
|
feeCollectionKeeper auth.FeeCollectionKeeper
|
||||||
bankKeeper bank.Keeper
|
bankKeeper bank.Keeper
|
||||||
ibcMapper ibc.Mapper
|
ibcMapper ibc.Mapper
|
||||||
|
@ -67,14 +67,14 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba
|
||||||
}
|
}
|
||||||
|
|
||||||
// define and attach the mappers and keepers
|
// define and attach the mappers and keepers
|
||||||
app.accountMapper = auth.NewAccountMapper(
|
app.accountKeeper = auth.NewAccountKeeper(
|
||||||
cdc,
|
cdc,
|
||||||
app.keyAccount, // target store
|
app.keyAccount, // target store
|
||||||
func() auth.Account {
|
func() auth.Account {
|
||||||
return &types.AppAccount{}
|
return &types.AppAccount{}
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
app.bankKeeper = bank.NewBaseKeeper(app.accountMapper)
|
app.bankKeeper = bank.NewBaseKeeper(app.accountKeeper)
|
||||||
app.ibcMapper = ibc.NewMapper(app.cdc, app.keyIBC, app.RegisterCodespace(ibc.DefaultCodespace))
|
app.ibcMapper = ibc.NewMapper(app.cdc, app.keyIBC, app.RegisterCodespace(ibc.DefaultCodespace))
|
||||||
|
|
||||||
// register message routes
|
// register message routes
|
||||||
|
@ -86,7 +86,7 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba
|
||||||
app.SetInitChainer(app.initChainer)
|
app.SetInitChainer(app.initChainer)
|
||||||
app.SetBeginBlocker(app.BeginBlocker)
|
app.SetBeginBlocker(app.BeginBlocker)
|
||||||
app.SetEndBlocker(app.EndBlocker)
|
app.SetEndBlocker(app.EndBlocker)
|
||||||
app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper, app.feeCollectionKeeper))
|
app.SetAnteHandler(auth.NewAnteHandler(app.accountKeeper, app.feeCollectionKeeper))
|
||||||
|
|
||||||
// mount the multistore and load the latest state
|
// mount the multistore and load the latest state
|
||||||
app.MountStoresIAVL(app.keyMain, app.keyAccount, app.keyIBC)
|
app.MountStoresIAVL(app.keyMain, app.keyAccount, app.keyIBC)
|
||||||
|
@ -153,8 +153,8 @@ func (app *BasecoinApp) initChainer(ctx sdk.Context, req abci.RequestInitChain)
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
acc.AccountNumber = app.accountMapper.GetNextAccountNumber(ctx)
|
acc.AccountNumber = app.accountKeeper.GetNextAccountNumber(ctx)
|
||||||
app.accountMapper.SetAccount(ctx, acc)
|
app.accountKeeper.SetAccount(ctx, acc)
|
||||||
}
|
}
|
||||||
|
|
||||||
return abci.ResponseInitChain{}
|
return abci.ResponseInitChain{}
|
||||||
|
@ -177,7 +177,7 @@ func (app *BasecoinApp) ExportAppStateAndValidators() (appState json.RawMessage,
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
app.accountMapper.IterateAccounts(ctx, appendAccountsFn)
|
app.accountKeeper.IterateAccounts(ctx, appendAccountsFn)
|
||||||
|
|
||||||
genState := types.GenesisState{Accounts: accounts}
|
genState := types.GenesisState{Accounts: accounts}
|
||||||
appState, err = codec.MarshalJSONIndent(app.cdc, genState)
|
appState, err = codec.MarshalJSONIndent(app.cdc, genState)
|
||||||
|
|
|
@ -61,7 +61,7 @@ func TestGenesis(t *testing.T) {
|
||||||
|
|
||||||
// create a context for the BaseApp
|
// create a context for the BaseApp
|
||||||
ctx := baseApp.BaseApp.NewContext(true, abci.Header{})
|
ctx := baseApp.BaseApp.NewContext(true, abci.Header{})
|
||||||
res := baseApp.accountMapper.GetAccount(ctx, baseAcct.Address)
|
res := baseApp.accountKeeper.GetAccount(ctx, baseAcct.Address)
|
||||||
require.Equal(t, appAcct, res)
|
require.Equal(t, appAcct, res)
|
||||||
|
|
||||||
// reload app and ensure the account is still there
|
// reload app and ensure the account is still there
|
||||||
|
@ -76,6 +76,6 @@ func TestGenesis(t *testing.T) {
|
||||||
})
|
})
|
||||||
|
|
||||||
ctx = baseApp.BaseApp.NewContext(true, abci.Header{})
|
ctx = baseApp.BaseApp.NewContext(true, abci.Header{})
|
||||||
res = baseApp.accountMapper.GetAccount(ctx, baseAcct.Address)
|
res = baseApp.accountKeeper.GetAccount(ctx, baseAcct.Address)
|
||||||
require.Equal(t, appAcct, res)
|
require.Equal(t, appAcct, res)
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@ var _ auth.Account = (*AppAccount)(nil)
|
||||||
|
|
||||||
// AppAccount is a custom extension for this application. It is an example of
|
// AppAccount is a custom extension for this application. It is an example of
|
||||||
// extending auth.BaseAccount with custom fields. It is compatible with the
|
// extending auth.BaseAccount with custom fields. It is compatible with the
|
||||||
// stock auth.AccountMapper, since auth.AccountMapper uses the flexible go-amino
|
// stock auth.AccountKeeper, since auth.AccountKeeper uses the flexible go-amino
|
||||||
// library.
|
// library.
|
||||||
type AppAccount struct {
|
type AppAccount struct {
|
||||||
auth.BaseAccount
|
auth.BaseAccount
|
||||||
|
|
|
@ -55,7 +55,7 @@ type DemocoinApp struct {
|
||||||
stakeKeeper simplestake.Keeper
|
stakeKeeper simplestake.Keeper
|
||||||
|
|
||||||
// Manage getting and setting accounts
|
// Manage getting and setting accounts
|
||||||
accountMapper auth.AccountMapper
|
accountKeeper auth.AccountKeeper
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewDemocoinApp(logger log.Logger, db dbm.DB) *DemocoinApp {
|
func NewDemocoinApp(logger log.Logger, db dbm.DB) *DemocoinApp {
|
||||||
|
@ -74,15 +74,15 @@ func NewDemocoinApp(logger log.Logger, db dbm.DB) *DemocoinApp {
|
||||||
capKeyStakingStore: sdk.NewKVStoreKey("stake"),
|
capKeyStakingStore: sdk.NewKVStoreKey("stake"),
|
||||||
}
|
}
|
||||||
|
|
||||||
// Define the accountMapper.
|
// Define the accountKeeper.
|
||||||
app.accountMapper = auth.NewAccountMapper(
|
app.accountKeeper = auth.NewAccountKeeper(
|
||||||
cdc,
|
cdc,
|
||||||
app.capKeyAccountStore, // target store
|
app.capKeyAccountStore, // target store
|
||||||
types.ProtoAppAccount, // prototype
|
types.ProtoAppAccount, // prototype
|
||||||
)
|
)
|
||||||
|
|
||||||
// Add handlers.
|
// Add handlers.
|
||||||
app.bankKeeper = bank.NewBaseKeeper(app.accountMapper)
|
app.bankKeeper = bank.NewBaseKeeper(app.accountKeeper)
|
||||||
app.coolKeeper = cool.NewKeeper(app.capKeyMainStore, app.bankKeeper, app.RegisterCodespace(cool.DefaultCodespace))
|
app.coolKeeper = cool.NewKeeper(app.capKeyMainStore, app.bankKeeper, app.RegisterCodespace(cool.DefaultCodespace))
|
||||||
app.powKeeper = pow.NewKeeper(app.capKeyPowStore, pow.NewConfig("pow", int64(1)), app.bankKeeper, app.RegisterCodespace(pow.DefaultCodespace))
|
app.powKeeper = pow.NewKeeper(app.capKeyPowStore, pow.NewConfig("pow", int64(1)), app.bankKeeper, app.RegisterCodespace(pow.DefaultCodespace))
|
||||||
app.ibcMapper = ibc.NewMapper(app.cdc, app.capKeyIBCStore, app.RegisterCodespace(ibc.DefaultCodespace))
|
app.ibcMapper = ibc.NewMapper(app.cdc, app.capKeyIBCStore, app.RegisterCodespace(ibc.DefaultCodespace))
|
||||||
|
@ -98,7 +98,7 @@ func NewDemocoinApp(logger log.Logger, db dbm.DB) *DemocoinApp {
|
||||||
// Initialize BaseApp.
|
// Initialize BaseApp.
|
||||||
app.SetInitChainer(app.initChainerFn(app.coolKeeper, app.powKeeper))
|
app.SetInitChainer(app.initChainerFn(app.coolKeeper, app.powKeeper))
|
||||||
app.MountStoresIAVL(app.capKeyMainStore, app.capKeyAccountStore, app.capKeyPowStore, app.capKeyIBCStore, app.capKeyStakingStore)
|
app.MountStoresIAVL(app.capKeyMainStore, app.capKeyAccountStore, app.capKeyPowStore, app.capKeyIBCStore, app.capKeyStakingStore)
|
||||||
app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper, app.feeCollectionKeeper))
|
app.SetAnteHandler(auth.NewAnteHandler(app.accountKeeper, app.feeCollectionKeeper))
|
||||||
err := app.LoadLatestVersion(app.capKeyMainStore)
|
err := app.LoadLatestVersion(app.capKeyMainStore)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
cmn.Exit(err.Error())
|
cmn.Exit(err.Error())
|
||||||
|
@ -148,7 +148,7 @@ func (app *DemocoinApp) initChainerFn(coolKeeper cool.Keeper, powKeeper pow.Keep
|
||||||
panic(err) // TODO https://github.com/cosmos/cosmos-sdk/issues/468
|
panic(err) // TODO https://github.com/cosmos/cosmos-sdk/issues/468
|
||||||
// return sdk.ErrGenesisParse("").TraceCause(err, "")
|
// return sdk.ErrGenesisParse("").TraceCause(err, "")
|
||||||
}
|
}
|
||||||
app.accountMapper.SetAccount(ctx, acc)
|
app.accountKeeper.SetAccount(ctx, acc)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Application specific genesis handling
|
// Application specific genesis handling
|
||||||
|
@ -182,7 +182,7 @@ func (app *DemocoinApp) ExportAppStateAndValidators() (appState json.RawMessage,
|
||||||
accounts = append(accounts, account)
|
accounts = append(accounts, account)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
app.accountMapper.IterateAccounts(ctx, appendAccount)
|
app.accountKeeper.IterateAccounts(ctx, appendAccount)
|
||||||
|
|
||||||
genState := types.GenesisState{
|
genState := types.GenesisState{
|
||||||
Accounts: accounts,
|
Accounts: accounts,
|
||||||
|
|
|
@ -60,13 +60,13 @@ func TestGenesis(t *testing.T) {
|
||||||
require.Nil(t, err)
|
require.Nil(t, err)
|
||||||
// A checkTx context
|
// A checkTx context
|
||||||
ctx := bapp.BaseApp.NewContext(true, abci.Header{})
|
ctx := bapp.BaseApp.NewContext(true, abci.Header{})
|
||||||
res1 := bapp.accountMapper.GetAccount(ctx, baseAcc.Address)
|
res1 := bapp.accountKeeper.GetAccount(ctx, baseAcc.Address)
|
||||||
require.Equal(t, acc, res1)
|
require.Equal(t, acc, res1)
|
||||||
|
|
||||||
// reload app and ensure the account is still there
|
// reload app and ensure the account is still there
|
||||||
bapp = NewDemocoinApp(logger, db)
|
bapp = NewDemocoinApp(logger, db)
|
||||||
bapp.InitChain(abci.RequestInitChain{AppStateBytes: []byte("{}")})
|
bapp.InitChain(abci.RequestInitChain{AppStateBytes: []byte("{}")})
|
||||||
ctx = bapp.BaseApp.NewContext(true, abci.Header{})
|
ctx = bapp.BaseApp.NewContext(true, abci.Header{})
|
||||||
res1 = bapp.accountMapper.GetAccount(ctx, baseAcc.Address)
|
res1 = bapp.accountKeeper.GetAccount(ctx, baseAcc.Address)
|
||||||
require.Equal(t, acc, res1)
|
require.Equal(t, acc, res1)
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ func getMockApp(t *testing.T) *mock.App {
|
||||||
|
|
||||||
RegisterCodec(mapp.Cdc)
|
RegisterCodec(mapp.Cdc)
|
||||||
keyCool := sdk.NewKVStoreKey("cool")
|
keyCool := sdk.NewKVStoreKey("cool")
|
||||||
bankKeeper := bank.NewBaseKeeper(mapp.AccountMapper)
|
bankKeeper := bank.NewBaseKeeper(mapp.AccountKeeper)
|
||||||
keeper := NewKeeper(keyCool, bankKeeper, mapp.RegisterCodespace(DefaultCodespace))
|
keeper := NewKeeper(keyCool, bankKeeper, mapp.RegisterCodespace(DefaultCodespace))
|
||||||
mapp.Router().AddRoute("cool", NewHandler(keeper))
|
mapp.Router().AddRoute("cool", NewHandler(keeper))
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ func TestMsgQuiz(t *testing.T) {
|
||||||
|
|
||||||
// A checkTx context (true)
|
// A checkTx context (true)
|
||||||
ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{})
|
ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{})
|
||||||
res1 := mapp.AccountMapper.GetAccount(ctxCheck, addr1)
|
res1 := mapp.AccountKeeper.GetAccount(ctxCheck, addr1)
|
||||||
require.Equal(t, acc1, res1)
|
require.Equal(t, acc1, res1)
|
||||||
|
|
||||||
// Set the trend, submit a really cool quiz and check for reward
|
// Set the trend, submit a really cool quiz and check for reward
|
||||||
|
|
|
@ -29,7 +29,7 @@ func (k Keeper) GetTrend(ctx sdk.Context) string {
|
||||||
return string(bz)
|
return string(bz)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Implements sdk.AccountMapper.
|
// Implements sdk.AccountKeeper.
|
||||||
func (k Keeper) setTrend(ctx sdk.Context, newTrend string) {
|
func (k Keeper) setTrend(ctx sdk.Context, newTrend string) {
|
||||||
store := ctx.KVStore(k.storeKey)
|
store := ctx.KVStore(k.storeKey)
|
||||||
store.Set(trendKey, []byte(newTrend))
|
store.Set(trendKey, []byte(newTrend))
|
||||||
|
|
|
@ -29,7 +29,7 @@ func TestCoolKeeper(t *testing.T) {
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
am := auth.NewAccountMapper(cdc, capKey, auth.ProtoBaseAccount)
|
am := auth.NewAccountKeeper(cdc, capKey, auth.ProtoBaseAccount)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, nil)
|
ctx := sdk.NewContext(ms, abci.Header{}, false, nil)
|
||||||
ck := bank.NewBaseKeeper(am)
|
ck := bank.NewBaseKeeper(am)
|
||||||
keeper := NewKeeper(capKey, ck, DefaultCodespace)
|
keeper := NewKeeper(capKey, ck, DefaultCodespace)
|
||||||
|
|
|
@ -25,7 +25,7 @@ func getMockApp(t *testing.T) *mock.App {
|
||||||
|
|
||||||
RegisterCodec(mapp.Cdc)
|
RegisterCodec(mapp.Cdc)
|
||||||
keyPOW := sdk.NewKVStoreKey("pow")
|
keyPOW := sdk.NewKVStoreKey("pow")
|
||||||
bankKeeper := bank.NewBaseKeeper(mapp.AccountMapper)
|
bankKeeper := bank.NewBaseKeeper(mapp.AccountKeeper)
|
||||||
config := Config{"pow", 1}
|
config := Config{"pow", 1}
|
||||||
keeper := NewKeeper(keyPOW, config, bankKeeper, mapp.RegisterCodespace(DefaultCodespace))
|
keeper := NewKeeper(keyPOW, config, bankKeeper, mapp.RegisterCodespace(DefaultCodespace))
|
||||||
mapp.Router().AddRoute("pow", keeper.Handler)
|
mapp.Router().AddRoute("pow", keeper.Handler)
|
||||||
|
@ -69,7 +69,7 @@ func TestMsgMine(t *testing.T) {
|
||||||
|
|
||||||
// A checkTx context (true)
|
// A checkTx context (true)
|
||||||
ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{})
|
ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{})
|
||||||
res1 := mapp.AccountMapper.GetAccount(ctxCheck, addr1)
|
res1 := mapp.AccountKeeper.GetAccount(ctxCheck, addr1)
|
||||||
require.Equal(t, acc1, res1)
|
require.Equal(t, acc1, res1)
|
||||||
|
|
||||||
// Mine and check for reward
|
// Mine and check for reward
|
||||||
|
|
|
@ -19,7 +19,7 @@ func TestPowHandler(t *testing.T) {
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
am := auth.NewAccountMapper(cdc, capKey, auth.ProtoBaseAccount)
|
am := auth.NewAccountKeeper(cdc, capKey, auth.ProtoBaseAccount)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
||||||
config := NewConfig("pow", int64(1))
|
config := NewConfig("pow", int64(1))
|
||||||
ck := bank.NewBaseKeeper(am)
|
ck := bank.NewBaseKeeper(am)
|
||||||
|
|
|
@ -32,7 +32,7 @@ func TestPowKeeperGetSet(t *testing.T) {
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
am := auth.NewAccountMapper(cdc, capKey, auth.ProtoBaseAccount)
|
am := auth.NewAccountKeeper(cdc, capKey, auth.ProtoBaseAccount)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
||||||
config := NewConfig("pow", int64(1))
|
config := NewConfig("pow", int64(1))
|
||||||
ck := bank.NewBaseKeeper(am)
|
ck := bank.NewBaseKeeper(am)
|
||||||
|
|
|
@ -35,8 +35,8 @@ func TestKeeperGetSet(t *testing.T) {
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
accountMapper := auth.NewAccountMapper(cdc, authKey, auth.ProtoBaseAccount)
|
accountKeeper := auth.NewAccountKeeper(cdc, authKey, auth.ProtoBaseAccount)
|
||||||
stakeKeeper := NewKeeper(capKey, bank.NewBaseKeeper(accountMapper), DefaultCodespace)
|
stakeKeeper := NewKeeper(capKey, bank.NewBaseKeeper(accountKeeper), DefaultCodespace)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
||||||
addr := sdk.AccAddress([]byte("some-address"))
|
addr := sdk.AccAddress([]byte("some-address"))
|
||||||
|
|
||||||
|
@ -65,8 +65,8 @@ func TestBonding(t *testing.T) {
|
||||||
|
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
||||||
|
|
||||||
accountMapper := auth.NewAccountMapper(cdc, authKey, auth.ProtoBaseAccount)
|
accountKeeper := auth.NewAccountKeeper(cdc, authKey, auth.ProtoBaseAccount)
|
||||||
bankKeeper := bank.NewBaseKeeper(accountMapper)
|
bankKeeper := bank.NewBaseKeeper(accountKeeper)
|
||||||
stakeKeeper := NewKeeper(capKey, bankKeeper, DefaultCodespace)
|
stakeKeeper := NewKeeper(capKey, bankKeeper, DefaultCodespace)
|
||||||
addr := sdk.AccAddress([]byte("some-address"))
|
addr := sdk.AccAddress([]byte("some-address"))
|
||||||
privKey := ed25519.GenPrivKey()
|
privKey := ed25519.GenPrivKey()
|
||||||
|
|
|
@ -22,7 +22,7 @@ const (
|
||||||
// NewAnteHandler returns an AnteHandler that checks
|
// NewAnteHandler returns an AnteHandler that checks
|
||||||
// and increments sequence numbers, checks signatures & account numbers,
|
// and increments sequence numbers, checks signatures & account numbers,
|
||||||
// and deducts fees from the first signer.
|
// and deducts fees from the first signer.
|
||||||
func NewAnteHandler(am AccountMapper, fck FeeCollectionKeeper) sdk.AnteHandler {
|
func NewAnteHandler(am AccountKeeper, fck FeeCollectionKeeper) sdk.AnteHandler {
|
||||||
return func(
|
return func(
|
||||||
ctx sdk.Context, tx sdk.Tx, simulate bool,
|
ctx sdk.Context, tx sdk.Tx, simulate bool,
|
||||||
) (newCtx sdk.Context, res sdk.Result, abort bool) {
|
) (newCtx sdk.Context, res sdk.Result, abort bool) {
|
||||||
|
@ -137,7 +137,7 @@ func validateBasic(tx StdTx) (err sdk.Error) {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func getSignerAccs(ctx sdk.Context, am AccountMapper, addrs []sdk.AccAddress) (accs []Account, res sdk.Result) {
|
func getSignerAccs(ctx sdk.Context, am AccountKeeper, addrs []sdk.AccAddress) (accs []Account, res sdk.Result) {
|
||||||
accs = make([]Account, len(addrs))
|
accs = make([]Account, len(addrs))
|
||||||
for i := 0; i < len(accs); i++ {
|
for i := 0; i < len(accs); i++ {
|
||||||
accs[i] = am.GetAccount(ctx, addrs[i])
|
accs[i] = am.GetAccount(ctx, addrs[i])
|
||||||
|
@ -257,7 +257,7 @@ func adjustFeesByGas(fees sdk.Coins, gas int64) sdk.Coins {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Deduct the fee from the account.
|
// Deduct the fee from the account.
|
||||||
// We could use the CoinKeeper (in addition to the AccountMapper,
|
// We could use the CoinKeeper (in addition to the AccountKeeper,
|
||||||
// because the CoinKeeper doesn't give us accounts), but it seems easier to do this.
|
// because the CoinKeeper doesn't give us accounts), but it seems easier to do this.
|
||||||
func deductFees(acc Account, fee StdFee) (Account, sdk.Result) {
|
func deductFees(acc Account, fee StdFee) (Account, sdk.Result) {
|
||||||
coins := acc.GetCoins()
|
coins := acc.GetCoins()
|
||||||
|
|
|
@ -112,7 +112,7 @@ func TestAnteHandlerSigErrors(t *testing.T) {
|
||||||
ms, capKey, capKey2 := setupMultiStore()
|
ms, capKey, capKey2 := setupMultiStore()
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
||||||
anteHandler := NewAnteHandler(mapper, feeCollector)
|
anteHandler := NewAnteHandler(mapper, feeCollector)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
||||||
|
@ -165,7 +165,7 @@ func TestAnteHandlerAccountNumbers(t *testing.T) {
|
||||||
ms, capKey, capKey2 := setupMultiStore()
|
ms, capKey, capKey2 := setupMultiStore()
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
||||||
anteHandler := NewAnteHandler(mapper, feeCollector)
|
anteHandler := NewAnteHandler(mapper, feeCollector)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
||||||
|
@ -225,7 +225,7 @@ func TestAnteHandlerAccountNumbersAtBlockHeightZero(t *testing.T) {
|
||||||
ms, capKey, capKey2 := setupMultiStore()
|
ms, capKey, capKey2 := setupMultiStore()
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
||||||
anteHandler := NewAnteHandler(mapper, feeCollector)
|
anteHandler := NewAnteHandler(mapper, feeCollector)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
||||||
|
@ -285,7 +285,7 @@ func TestAnteHandlerSequences(t *testing.T) {
|
||||||
ms, capKey, capKey2 := setupMultiStore()
|
ms, capKey, capKey2 := setupMultiStore()
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
||||||
anteHandler := NewAnteHandler(mapper, feeCollector)
|
anteHandler := NewAnteHandler(mapper, feeCollector)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
||||||
|
@ -364,7 +364,7 @@ func TestAnteHandlerFees(t *testing.T) {
|
||||||
ms, capKey, capKey2 := setupMultiStore()
|
ms, capKey, capKey2 := setupMultiStore()
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
||||||
anteHandler := NewAnteHandler(mapper, feeCollector)
|
anteHandler := NewAnteHandler(mapper, feeCollector)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
||||||
|
@ -406,7 +406,7 @@ func TestAnteHandlerMemoGas(t *testing.T) {
|
||||||
ms, capKey, capKey2 := setupMultiStore()
|
ms, capKey, capKey2 := setupMultiStore()
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
||||||
anteHandler := NewAnteHandler(mapper, feeCollector)
|
anteHandler := NewAnteHandler(mapper, feeCollector)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
||||||
|
@ -450,7 +450,7 @@ func TestAnteHandlerMultiSigner(t *testing.T) {
|
||||||
ms, capKey, capKey2 := setupMultiStore()
|
ms, capKey, capKey2 := setupMultiStore()
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
||||||
anteHandler := NewAnteHandler(mapper, feeCollector)
|
anteHandler := NewAnteHandler(mapper, feeCollector)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
||||||
|
@ -502,7 +502,7 @@ func TestAnteHandlerBadSignBytes(t *testing.T) {
|
||||||
ms, capKey, capKey2 := setupMultiStore()
|
ms, capKey, capKey2 := setupMultiStore()
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
||||||
anteHandler := NewAnteHandler(mapper, feeCollector)
|
anteHandler := NewAnteHandler(mapper, feeCollector)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
||||||
|
@ -584,7 +584,7 @@ func TestAnteHandlerSetPubKey(t *testing.T) {
|
||||||
ms, capKey, capKey2 := setupMultiStore()
|
ms, capKey, capKey2 := setupMultiStore()
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
feeCollector := NewFeeCollectionKeeper(cdc, capKey2)
|
||||||
anteHandler := NewAnteHandler(mapper, feeCollector)
|
anteHandler := NewAnteHandler(mapper, feeCollector)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
||||||
|
@ -638,7 +638,7 @@ func TestProcessPubKey(t *testing.T) {
|
||||||
ms, capKey, _ := setupMultiStore()
|
ms, capKey, _ := setupMultiStore()
|
||||||
cdc := codec.New()
|
cdc := codec.New()
|
||||||
RegisterBaseAccount(cdc)
|
RegisterBaseAccount(cdc)
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
|
||||||
// keys
|
// keys
|
||||||
_, addr1 := privAndAddr()
|
_, addr1 := privAndAddr()
|
||||||
|
|
|
@ -8,7 +8,7 @@ import (
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
|
|
||||||
var accounts types.AccountMapper
|
var accounts types.AccountKeeper
|
||||||
|
|
||||||
// Fetch all signer accounts.
|
// Fetch all signer accounts.
|
||||||
addrs := tx.GetSigners()
|
addrs := tx.GetSigners()
|
||||||
|
|
|
@ -8,9 +8,9 @@ import (
|
||||||
|
|
||||||
var globalAccountNumberKey = []byte("globalAccountNumber")
|
var globalAccountNumberKey = []byte("globalAccountNumber")
|
||||||
|
|
||||||
// This AccountMapper encodes/decodes accounts using the
|
// This AccountKeeper encodes/decodes accounts using the
|
||||||
// go-amino (binary) encoding/decoding library.
|
// go-amino (binary) encoding/decoding library.
|
||||||
type AccountMapper struct {
|
type AccountKeeper struct {
|
||||||
|
|
||||||
// The (unexposed) key used to access the store from the Context.
|
// The (unexposed) key used to access the store from the Context.
|
||||||
key sdk.StoreKey
|
key sdk.StoreKey
|
||||||
|
@ -22,19 +22,19 @@ type AccountMapper struct {
|
||||||
cdc *codec.Codec
|
cdc *codec.Codec
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewAccountMapper returns a new sdk.AccountMapper that
|
// NewAccountKeeper returns a new sdk.AccountKeeper that
|
||||||
// uses go-amino to (binary) encode and decode concrete sdk.Accounts.
|
// uses go-amino to (binary) encode and decode concrete sdk.Accounts.
|
||||||
// nolint
|
// nolint
|
||||||
func NewAccountMapper(cdc *codec.Codec, key sdk.StoreKey, proto func() Account) AccountMapper {
|
func NewAccountKeeper(cdc *codec.Codec, key sdk.StoreKey, proto func() Account) AccountKeeper {
|
||||||
return AccountMapper{
|
return AccountKeeper{
|
||||||
key: key,
|
key: key,
|
||||||
proto: proto,
|
proto: proto,
|
||||||
cdc: cdc,
|
cdc: cdc,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Implaements sdk.AccountMapper.
|
// Implaements sdk.AccountKeeper.
|
||||||
func (am AccountMapper) NewAccountWithAddress(ctx sdk.Context, addr sdk.AccAddress) Account {
|
func (am AccountKeeper) NewAccountWithAddress(ctx sdk.Context, addr sdk.AccAddress) Account {
|
||||||
acc := am.proto()
|
acc := am.proto()
|
||||||
err := acc.SetAddress(addr)
|
err := acc.SetAddress(addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -50,7 +50,7 @@ func (am AccountMapper) NewAccountWithAddress(ctx sdk.Context, addr sdk.AccAddre
|
||||||
}
|
}
|
||||||
|
|
||||||
// New Account
|
// New Account
|
||||||
func (am AccountMapper) NewAccount(ctx sdk.Context, acc Account) Account {
|
func (am AccountKeeper) NewAccount(ctx sdk.Context, acc Account) Account {
|
||||||
err := acc.SetAccountNumber(am.GetNextAccountNumber(ctx))
|
err := acc.SetAccountNumber(am.GetNextAccountNumber(ctx))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// TODO: Handle with #870
|
// TODO: Handle with #870
|
||||||
|
@ -64,8 +64,8 @@ func AddressStoreKey(addr sdk.AccAddress) []byte {
|
||||||
return append([]byte("account:"), addr.Bytes()...)
|
return append([]byte("account:"), addr.Bytes()...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Implements sdk.AccountMapper.
|
// Implements sdk.AccountKeeper.
|
||||||
func (am AccountMapper) GetAccount(ctx sdk.Context, addr sdk.AccAddress) Account {
|
func (am AccountKeeper) GetAccount(ctx sdk.Context, addr sdk.AccAddress) Account {
|
||||||
store := ctx.KVStore(am.key)
|
store := ctx.KVStore(am.key)
|
||||||
bz := store.Get(AddressStoreKey(addr))
|
bz := store.Get(AddressStoreKey(addr))
|
||||||
if bz == nil {
|
if bz == nil {
|
||||||
|
@ -75,8 +75,8 @@ func (am AccountMapper) GetAccount(ctx sdk.Context, addr sdk.AccAddress) Account
|
||||||
return acc
|
return acc
|
||||||
}
|
}
|
||||||
|
|
||||||
// Implements sdk.AccountMapper.
|
// Implements sdk.AccountKeeper.
|
||||||
func (am AccountMapper) SetAccount(ctx sdk.Context, acc Account) {
|
func (am AccountKeeper) SetAccount(ctx sdk.Context, acc Account) {
|
||||||
addr := acc.GetAddress()
|
addr := acc.GetAddress()
|
||||||
store := ctx.KVStore(am.key)
|
store := ctx.KVStore(am.key)
|
||||||
bz := am.encodeAccount(acc)
|
bz := am.encodeAccount(acc)
|
||||||
|
@ -84,14 +84,14 @@ func (am AccountMapper) SetAccount(ctx sdk.Context, acc Account) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// RemoveAccount removes an account for the account mapper store.
|
// RemoveAccount removes an account for the account mapper store.
|
||||||
func (am AccountMapper) RemoveAccount(ctx sdk.Context, acc Account) {
|
func (am AccountKeeper) RemoveAccount(ctx sdk.Context, acc Account) {
|
||||||
addr := acc.GetAddress()
|
addr := acc.GetAddress()
|
||||||
store := ctx.KVStore(am.key)
|
store := ctx.KVStore(am.key)
|
||||||
store.Delete(AddressStoreKey(addr))
|
store.Delete(AddressStoreKey(addr))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Implements sdk.AccountMapper.
|
// Implements sdk.AccountKeeper.
|
||||||
func (am AccountMapper) IterateAccounts(ctx sdk.Context, process func(Account) (stop bool)) {
|
func (am AccountKeeper) IterateAccounts(ctx sdk.Context, process func(Account) (stop bool)) {
|
||||||
store := ctx.KVStore(am.key)
|
store := ctx.KVStore(am.key)
|
||||||
iter := sdk.KVStorePrefixIterator(store, []byte("account:"))
|
iter := sdk.KVStorePrefixIterator(store, []byte("account:"))
|
||||||
defer iter.Close()
|
defer iter.Close()
|
||||||
|
@ -109,7 +109,7 @@ func (am AccountMapper) IterateAccounts(ctx sdk.Context, process func(Account) (
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns the PubKey of the account at address
|
// Returns the PubKey of the account at address
|
||||||
func (am AccountMapper) GetPubKey(ctx sdk.Context, addr sdk.AccAddress) (crypto.PubKey, sdk.Error) {
|
func (am AccountKeeper) GetPubKey(ctx sdk.Context, addr sdk.AccAddress) (crypto.PubKey, sdk.Error) {
|
||||||
acc := am.GetAccount(ctx, addr)
|
acc := am.GetAccount(ctx, addr)
|
||||||
if acc == nil {
|
if acc == nil {
|
||||||
return nil, sdk.ErrUnknownAddress(addr.String())
|
return nil, sdk.ErrUnknownAddress(addr.String())
|
||||||
|
@ -118,7 +118,7 @@ func (am AccountMapper) GetPubKey(ctx sdk.Context, addr sdk.AccAddress) (crypto.
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns the Sequence of the account at address
|
// Returns the Sequence of the account at address
|
||||||
func (am AccountMapper) GetSequence(ctx sdk.Context, addr sdk.AccAddress) (int64, sdk.Error) {
|
func (am AccountKeeper) GetSequence(ctx sdk.Context, addr sdk.AccAddress) (int64, sdk.Error) {
|
||||||
acc := am.GetAccount(ctx, addr)
|
acc := am.GetAccount(ctx, addr)
|
||||||
if acc == nil {
|
if acc == nil {
|
||||||
return 0, sdk.ErrUnknownAddress(addr.String())
|
return 0, sdk.ErrUnknownAddress(addr.String())
|
||||||
|
@ -126,7 +126,7 @@ func (am AccountMapper) GetSequence(ctx sdk.Context, addr sdk.AccAddress) (int64
|
||||||
return acc.GetSequence(), nil
|
return acc.GetSequence(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (am AccountMapper) setSequence(ctx sdk.Context, addr sdk.AccAddress, newSequence int64) sdk.Error {
|
func (am AccountKeeper) setSequence(ctx sdk.Context, addr sdk.AccAddress, newSequence int64) sdk.Error {
|
||||||
acc := am.GetAccount(ctx, addr)
|
acc := am.GetAccount(ctx, addr)
|
||||||
if acc == nil {
|
if acc == nil {
|
||||||
return sdk.ErrUnknownAddress(addr.String())
|
return sdk.ErrUnknownAddress(addr.String())
|
||||||
|
@ -141,7 +141,7 @@ func (am AccountMapper) setSequence(ctx sdk.Context, addr sdk.AccAddress, newSeq
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns and increments the global account number counter
|
// Returns and increments the global account number counter
|
||||||
func (am AccountMapper) GetNextAccountNumber(ctx sdk.Context) int64 {
|
func (am AccountKeeper) GetNextAccountNumber(ctx sdk.Context) int64 {
|
||||||
var accNumber int64
|
var accNumber int64
|
||||||
store := ctx.KVStore(am.key)
|
store := ctx.KVStore(am.key)
|
||||||
bz := store.Get(globalAccountNumberKey)
|
bz := store.Get(globalAccountNumberKey)
|
||||||
|
@ -163,7 +163,7 @@ func (am AccountMapper) GetNextAccountNumber(ctx sdk.Context) int64 {
|
||||||
//----------------------------------------
|
//----------------------------------------
|
||||||
// misc.
|
// misc.
|
||||||
|
|
||||||
func (am AccountMapper) encodeAccount(acc Account) []byte {
|
func (am AccountKeeper) encodeAccount(acc Account) []byte {
|
||||||
bz, err := am.cdc.MarshalBinaryBare(acc)
|
bz, err := am.cdc.MarshalBinaryBare(acc)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
|
@ -171,7 +171,7 @@ func (am AccountMapper) encodeAccount(acc Account) []byte {
|
||||||
return bz
|
return bz
|
||||||
}
|
}
|
||||||
|
|
||||||
func (am AccountMapper) decodeAccount(bz []byte) (acc Account) {
|
func (am AccountKeeper) decodeAccount(bz []byte) (acc Account) {
|
||||||
err := am.cdc.UnmarshalBinaryBare(bz, &acc)
|
err := am.cdc.UnmarshalBinaryBare(bz, &acc)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
|
|
|
@ -32,7 +32,7 @@ func TestAccountMapperGetSet(t *testing.T) {
|
||||||
|
|
||||||
// make context and mapper
|
// make context and mapper
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
|
|
||||||
addr := sdk.AccAddress([]byte("some-address"))
|
addr := sdk.AccAddress([]byte("some-address"))
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ func TestAccountMapperRemoveAccount(t *testing.T) {
|
||||||
|
|
||||||
// make context and mapper
|
// make context and mapper
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
|
|
||||||
addr1 := sdk.AccAddress([]byte("addr1"))
|
addr1 := sdk.AccAddress([]byte("addr1"))
|
||||||
addr2 := sdk.AccAddress([]byte("addr2"))
|
addr2 := sdk.AccAddress([]byte("addr2"))
|
||||||
|
@ -106,7 +106,7 @@ func BenchmarkAccountMapperGetAccountFound(b *testing.B) {
|
||||||
|
|
||||||
// make context and mapper
|
// make context and mapper
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
||||||
mapper := NewAccountMapper(cdc, capKey, ProtoBaseAccount)
|
mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
|
||||||
|
|
||||||
// assumes b.N < 2**24
|
// assumes b.N < 2**24
|
||||||
for i := 0; i < b.N; i++ {
|
for i := 0; i < b.N; i++ {
|
||||||
|
|
|
@ -102,7 +102,7 @@ func TestMsgSendWithAccounts(t *testing.T) {
|
||||||
|
|
||||||
ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{})
|
ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{})
|
||||||
|
|
||||||
res1 := mapp.AccountMapper.GetAccount(ctxCheck, addr1)
|
res1 := mapp.AccountKeeper.GetAccount(ctxCheck, addr1)
|
||||||
require.NotNil(t, res1)
|
require.NotNil(t, res1)
|
||||||
require.Equal(t, acc, res1.(*auth.BaseAccount))
|
require.Equal(t, acc, res1.(*auth.BaseAccount))
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ func getBenchmarkMockApp() (*mock.App, error) {
|
||||||
mapp := mock.NewApp()
|
mapp := mock.NewApp()
|
||||||
|
|
||||||
RegisterCodec(mapp.Cdc)
|
RegisterCodec(mapp.Cdc)
|
||||||
bankKeeper := NewBaseKeeper(mapp.AccountMapper)
|
bankKeeper := NewBaseKeeper(mapp.AccountKeeper)
|
||||||
mapp.Router().AddRoute("bank", NewHandler(bankKeeper))
|
mapp.Router().AddRoute("bank", NewHandler(bankKeeper))
|
||||||
|
|
||||||
err := mapp.CompleteSetup()
|
err := mapp.CompleteSetup()
|
||||||
|
|
|
@ -29,11 +29,11 @@ var _ Keeper = (*BaseKeeper)(nil)
|
||||||
// BaseKeeper manages transfers between accounts. It implements the Keeper
|
// BaseKeeper manages transfers between accounts. It implements the Keeper
|
||||||
// interface.
|
// interface.
|
||||||
type BaseKeeper struct {
|
type BaseKeeper struct {
|
||||||
am auth.AccountMapper
|
am auth.AccountKeeper
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewBaseKeeper returns a new BaseKeeper
|
// NewBaseKeeper returns a new BaseKeeper
|
||||||
func NewBaseKeeper(am auth.AccountMapper) BaseKeeper {
|
func NewBaseKeeper(am auth.AccountKeeper) BaseKeeper {
|
||||||
return BaseKeeper{am: am}
|
return BaseKeeper{am: am}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -96,11 +96,11 @@ var _ SendKeeper = (*BaseSendKeeper)(nil)
|
||||||
// SendKeeper only allows transfers between accounts without the possibility of
|
// SendKeeper only allows transfers between accounts without the possibility of
|
||||||
// creating coins. It implements the SendKeeper interface.
|
// creating coins. It implements the SendKeeper interface.
|
||||||
type BaseSendKeeper struct {
|
type BaseSendKeeper struct {
|
||||||
am auth.AccountMapper
|
am auth.AccountKeeper
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewBaseSendKeeper returns a new BaseSendKeeper.
|
// NewBaseSendKeeper returns a new BaseSendKeeper.
|
||||||
func NewBaseSendKeeper(am auth.AccountMapper) BaseSendKeeper {
|
func NewBaseSendKeeper(am auth.AccountKeeper) BaseSendKeeper {
|
||||||
return BaseSendKeeper{am: am}
|
return BaseSendKeeper{am: am}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -143,11 +143,11 @@ var _ ViewKeeper = (*BaseViewKeeper)(nil)
|
||||||
|
|
||||||
// BaseViewKeeper implements a read only keeper implementation of ViewKeeper.
|
// BaseViewKeeper implements a read only keeper implementation of ViewKeeper.
|
||||||
type BaseViewKeeper struct {
|
type BaseViewKeeper struct {
|
||||||
am auth.AccountMapper
|
am auth.AccountKeeper
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewBaseViewKeeper returns a new BaseViewKeeper.
|
// NewBaseViewKeeper returns a new BaseViewKeeper.
|
||||||
func NewBaseViewKeeper(am auth.AccountMapper) BaseViewKeeper {
|
func NewBaseViewKeeper(am auth.AccountKeeper) BaseViewKeeper {
|
||||||
return BaseViewKeeper{am: am}
|
return BaseViewKeeper{am: am}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -163,7 +163,7 @@ func (keeper BaseViewKeeper) HasCoins(ctx sdk.Context, addr sdk.AccAddress, amt
|
||||||
|
|
||||||
//______________________________________________________________________________________________
|
//______________________________________________________________________________________________
|
||||||
|
|
||||||
func getCoins(ctx sdk.Context, am auth.AccountMapper, addr sdk.AccAddress) sdk.Coins {
|
func getCoins(ctx sdk.Context, am auth.AccountKeeper, addr sdk.AccAddress) sdk.Coins {
|
||||||
ctx.GasMeter().ConsumeGas(costGetCoins, "getCoins")
|
ctx.GasMeter().ConsumeGas(costGetCoins, "getCoins")
|
||||||
acc := am.GetAccount(ctx, addr)
|
acc := am.GetAccount(ctx, addr)
|
||||||
if acc == nil {
|
if acc == nil {
|
||||||
|
@ -172,7 +172,7 @@ func getCoins(ctx sdk.Context, am auth.AccountMapper, addr sdk.AccAddress) sdk.C
|
||||||
return acc.GetCoins()
|
return acc.GetCoins()
|
||||||
}
|
}
|
||||||
|
|
||||||
func setCoins(ctx sdk.Context, am auth.AccountMapper, addr sdk.AccAddress, amt sdk.Coins) sdk.Error {
|
func setCoins(ctx sdk.Context, am auth.AccountKeeper, addr sdk.AccAddress, amt sdk.Coins) sdk.Error {
|
||||||
ctx.GasMeter().ConsumeGas(costSetCoins, "setCoins")
|
ctx.GasMeter().ConsumeGas(costSetCoins, "setCoins")
|
||||||
acc := am.GetAccount(ctx, addr)
|
acc := am.GetAccount(ctx, addr)
|
||||||
if acc == nil {
|
if acc == nil {
|
||||||
|
@ -188,13 +188,13 @@ func setCoins(ctx sdk.Context, am auth.AccountMapper, addr sdk.AccAddress, amt s
|
||||||
}
|
}
|
||||||
|
|
||||||
// HasCoins returns whether or not an account has at least amt coins.
|
// HasCoins returns whether or not an account has at least amt coins.
|
||||||
func hasCoins(ctx sdk.Context, am auth.AccountMapper, addr sdk.AccAddress, amt sdk.Coins) bool {
|
func hasCoins(ctx sdk.Context, am auth.AccountKeeper, addr sdk.AccAddress, amt sdk.Coins) bool {
|
||||||
ctx.GasMeter().ConsumeGas(costHasCoins, "hasCoins")
|
ctx.GasMeter().ConsumeGas(costHasCoins, "hasCoins")
|
||||||
return getCoins(ctx, am, addr).IsGTE(amt)
|
return getCoins(ctx, am, addr).IsGTE(amt)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SubtractCoins subtracts amt from the coins at the addr.
|
// SubtractCoins subtracts amt from the coins at the addr.
|
||||||
func subtractCoins(ctx sdk.Context, am auth.AccountMapper, addr sdk.AccAddress, amt sdk.Coins) (sdk.Coins, sdk.Tags, sdk.Error) {
|
func subtractCoins(ctx sdk.Context, am auth.AccountKeeper, addr sdk.AccAddress, amt sdk.Coins) (sdk.Coins, sdk.Tags, sdk.Error) {
|
||||||
ctx.GasMeter().ConsumeGas(costSubtractCoins, "subtractCoins")
|
ctx.GasMeter().ConsumeGas(costSubtractCoins, "subtractCoins")
|
||||||
oldCoins := getCoins(ctx, am, addr)
|
oldCoins := getCoins(ctx, am, addr)
|
||||||
newCoins := oldCoins.Minus(amt)
|
newCoins := oldCoins.Minus(amt)
|
||||||
|
@ -207,7 +207,7 @@ func subtractCoins(ctx sdk.Context, am auth.AccountMapper, addr sdk.AccAddress,
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddCoins adds amt to the coins at the addr.
|
// AddCoins adds amt to the coins at the addr.
|
||||||
func addCoins(ctx sdk.Context, am auth.AccountMapper, addr sdk.AccAddress, amt sdk.Coins) (sdk.Coins, sdk.Tags, sdk.Error) {
|
func addCoins(ctx sdk.Context, am auth.AccountKeeper, addr sdk.AccAddress, amt sdk.Coins) (sdk.Coins, sdk.Tags, sdk.Error) {
|
||||||
ctx.GasMeter().ConsumeGas(costAddCoins, "addCoins")
|
ctx.GasMeter().ConsumeGas(costAddCoins, "addCoins")
|
||||||
oldCoins := getCoins(ctx, am, addr)
|
oldCoins := getCoins(ctx, am, addr)
|
||||||
newCoins := oldCoins.Plus(amt)
|
newCoins := oldCoins.Plus(amt)
|
||||||
|
@ -221,7 +221,7 @@ func addCoins(ctx sdk.Context, am auth.AccountMapper, addr sdk.AccAddress, amt s
|
||||||
|
|
||||||
// SendCoins moves coins from one account to another
|
// SendCoins moves coins from one account to another
|
||||||
// NOTE: Make sure to revert state changes from tx on error
|
// NOTE: Make sure to revert state changes from tx on error
|
||||||
func sendCoins(ctx sdk.Context, am auth.AccountMapper, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) (sdk.Tags, sdk.Error) {
|
func sendCoins(ctx sdk.Context, am auth.AccountKeeper, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) (sdk.Tags, sdk.Error) {
|
||||||
_, subTags, err := subtractCoins(ctx, am, fromAddr, amt)
|
_, subTags, err := subtractCoins(ctx, am, fromAddr, amt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -237,7 +237,7 @@ func sendCoins(ctx sdk.Context, am auth.AccountMapper, fromAddr sdk.AccAddress,
|
||||||
|
|
||||||
// InputOutputCoins handles a list of inputs and outputs
|
// InputOutputCoins handles a list of inputs and outputs
|
||||||
// NOTE: Make sure to revert state changes from tx on error
|
// NOTE: Make sure to revert state changes from tx on error
|
||||||
func inputOutputCoins(ctx sdk.Context, am auth.AccountMapper, inputs []Input, outputs []Output) (sdk.Tags, sdk.Error) {
|
func inputOutputCoins(ctx sdk.Context, am auth.AccountKeeper, inputs []Input, outputs []Output) (sdk.Tags, sdk.Error) {
|
||||||
allTags := sdk.EmptyTags()
|
allTags := sdk.EmptyTags()
|
||||||
|
|
||||||
for _, in := range inputs {
|
for _, in := range inputs {
|
||||||
|
|
|
@ -33,16 +33,16 @@ func TestKeeper(t *testing.T) {
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
||||||
accountMapper := auth.NewAccountMapper(cdc, authKey, auth.ProtoBaseAccount)
|
accountKeeper := auth.NewAccountKeeper(cdc, authKey, auth.ProtoBaseAccount)
|
||||||
bankKeeper := NewBaseKeeper(accountMapper)
|
bankKeeper := NewBaseKeeper(accountKeeper)
|
||||||
|
|
||||||
addr := sdk.AccAddress([]byte("addr1"))
|
addr := sdk.AccAddress([]byte("addr1"))
|
||||||
addr2 := sdk.AccAddress([]byte("addr2"))
|
addr2 := sdk.AccAddress([]byte("addr2"))
|
||||||
addr3 := sdk.AccAddress([]byte("addr3"))
|
addr3 := sdk.AccAddress([]byte("addr3"))
|
||||||
acc := accountMapper.NewAccountWithAddress(ctx, addr)
|
acc := accountKeeper.NewAccountWithAddress(ctx, addr)
|
||||||
|
|
||||||
// Test GetCoins/SetCoins
|
// Test GetCoins/SetCoins
|
||||||
accountMapper.SetAccount(ctx, acc)
|
accountKeeper.SetAccount(ctx, acc)
|
||||||
require.True(t, bankKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{}))
|
require.True(t, bankKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{}))
|
||||||
|
|
||||||
bankKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})
|
bankKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})
|
||||||
|
@ -118,17 +118,17 @@ func TestSendKeeper(t *testing.T) {
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
||||||
accountMapper := auth.NewAccountMapper(cdc, authKey, auth.ProtoBaseAccount)
|
accountKeeper := auth.NewAccountKeeper(cdc, authKey, auth.ProtoBaseAccount)
|
||||||
bankKeeper := NewBaseKeeper(accountMapper)
|
bankKeeper := NewBaseKeeper(accountKeeper)
|
||||||
sendKeeper := NewBaseSendKeeper(accountMapper)
|
sendKeeper := NewBaseSendKeeper(accountKeeper)
|
||||||
|
|
||||||
addr := sdk.AccAddress([]byte("addr1"))
|
addr := sdk.AccAddress([]byte("addr1"))
|
||||||
addr2 := sdk.AccAddress([]byte("addr2"))
|
addr2 := sdk.AccAddress([]byte("addr2"))
|
||||||
addr3 := sdk.AccAddress([]byte("addr3"))
|
addr3 := sdk.AccAddress([]byte("addr3"))
|
||||||
acc := accountMapper.NewAccountWithAddress(ctx, addr)
|
acc := accountKeeper.NewAccountWithAddress(ctx, addr)
|
||||||
|
|
||||||
// Test GetCoins/SetCoins
|
// Test GetCoins/SetCoins
|
||||||
accountMapper.SetAccount(ctx, acc)
|
accountKeeper.SetAccount(ctx, acc)
|
||||||
require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{}))
|
require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{}))
|
||||||
|
|
||||||
bankKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})
|
bankKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})
|
||||||
|
@ -187,15 +187,15 @@ func TestViewKeeper(t *testing.T) {
|
||||||
auth.RegisterBaseAccount(cdc)
|
auth.RegisterBaseAccount(cdc)
|
||||||
|
|
||||||
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
|
||||||
accountMapper := auth.NewAccountMapper(cdc, authKey, auth.ProtoBaseAccount)
|
accountKeeper := auth.NewAccountKeeper(cdc, authKey, auth.ProtoBaseAccount)
|
||||||
bankKeeper := NewBaseKeeper(accountMapper)
|
bankKeeper := NewBaseKeeper(accountKeeper)
|
||||||
viewKeeper := NewBaseViewKeeper(accountMapper)
|
viewKeeper := NewBaseViewKeeper(accountKeeper)
|
||||||
|
|
||||||
addr := sdk.AccAddress([]byte("addr1"))
|
addr := sdk.AccAddress([]byte("addr1"))
|
||||||
acc := accountMapper.NewAccountWithAddress(ctx, addr)
|
acc := accountKeeper.NewAccountWithAddress(ctx, addr)
|
||||||
|
|
||||||
// Test GetCoins/SetCoins
|
// Test GetCoins/SetCoins
|
||||||
accountMapper.SetAccount(ctx, acc)
|
accountKeeper.SetAccount(ctx, acc)
|
||||||
require.True(t, viewKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{}))
|
require.True(t, viewKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{}))
|
||||||
|
|
||||||
bankKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})
|
bankKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})
|
||||||
|
|
|
@ -13,7 +13,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// NonnegativeBalanceInvariant checks that all accounts in the application have non-negative balances
|
// NonnegativeBalanceInvariant checks that all accounts in the application have non-negative balances
|
||||||
func NonnegativeBalanceInvariant(mapper auth.AccountMapper) simulation.Invariant {
|
func NonnegativeBalanceInvariant(mapper auth.AccountKeeper) simulation.Invariant {
|
||||||
return func(app *baseapp.BaseApp) error {
|
return func(app *baseapp.BaseApp) error {
|
||||||
ctx := app.NewContext(false, abci.Header{})
|
ctx := app.NewContext(false, abci.Header{})
|
||||||
accts := mock.GetAllAccounts(mapper, ctx)
|
accts := mock.GetAllAccounts(mapper, ctx)
|
||||||
|
@ -31,7 +31,7 @@ func NonnegativeBalanceInvariant(mapper auth.AccountMapper) simulation.Invariant
|
||||||
|
|
||||||
// TotalCoinsInvariant checks that the sum of the coins across all accounts
|
// TotalCoinsInvariant checks that the sum of the coins across all accounts
|
||||||
// is what is expected
|
// is what is expected
|
||||||
func TotalCoinsInvariant(mapper auth.AccountMapper, totalSupplyFn func() sdk.Coins) simulation.Invariant {
|
func TotalCoinsInvariant(mapper auth.AccountKeeper, totalSupplyFn func() sdk.Coins) simulation.Invariant {
|
||||||
return func(app *baseapp.BaseApp) error {
|
return func(app *baseapp.BaseApp) error {
|
||||||
ctx := app.NewContext(false, abci.Header{})
|
ctx := app.NewContext(false, abci.Header{})
|
||||||
totalCoins := sdk.Coins{}
|
totalCoins := sdk.Coins{}
|
||||||
|
|
|
@ -17,7 +17,7 @@ import (
|
||||||
|
|
||||||
// SingleInputSendTx tests and runs a single msg send w/ auth, with one input and one output, where both
|
// SingleInputSendTx tests and runs a single msg send w/ auth, with one input and one output, where both
|
||||||
// accounts already exist.
|
// accounts already exist.
|
||||||
func SingleInputSendTx(mapper auth.AccountMapper) simulation.Operation {
|
func SingleInputSendTx(mapper auth.AccountKeeper) simulation.Operation {
|
||||||
return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simulation.Account, event func(string)) (action string, fOps []simulation.FutureOperation, err error) {
|
return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simulation.Account, event func(string)) (action string, fOps []simulation.FutureOperation, err error) {
|
||||||
fromAcc, action, msg, abort := createSingleInputSendMsg(r, ctx, accs, mapper)
|
fromAcc, action, msg, abort := createSingleInputSendMsg(r, ctx, accs, mapper)
|
||||||
if abort {
|
if abort {
|
||||||
|
@ -35,7 +35,7 @@ func SingleInputSendTx(mapper auth.AccountMapper) simulation.Operation {
|
||||||
|
|
||||||
// SingleInputSendMsg tests and runs a single msg send, with one input and one output, where both
|
// SingleInputSendMsg tests and runs a single msg send, with one input and one output, where both
|
||||||
// accounts already exist.
|
// accounts already exist.
|
||||||
func SingleInputSendMsg(mapper auth.AccountMapper, bk bank.Keeper) simulation.Operation {
|
func SingleInputSendMsg(mapper auth.AccountKeeper, bk bank.Keeper) simulation.Operation {
|
||||||
handler := bank.NewHandler(bk)
|
handler := bank.NewHandler(bk)
|
||||||
return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simulation.Account, event func(string)) (action string, fOps []simulation.FutureOperation, err error) {
|
return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simulation.Account, event func(string)) (action string, fOps []simulation.FutureOperation, err error) {
|
||||||
fromAcc, action, msg, abort := createSingleInputSendMsg(r, ctx, accs, mapper)
|
fromAcc, action, msg, abort := createSingleInputSendMsg(r, ctx, accs, mapper)
|
||||||
|
@ -52,7 +52,7 @@ func SingleInputSendMsg(mapper auth.AccountMapper, bk bank.Keeper) simulation.Op
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func createSingleInputSendMsg(r *rand.Rand, ctx sdk.Context, accs []simulation.Account, mapper auth.AccountMapper) (fromAcc simulation.Account, action string, msg bank.MsgSend, abort bool) {
|
func createSingleInputSendMsg(r *rand.Rand, ctx sdk.Context, accs []simulation.Account, mapper auth.AccountKeeper) (fromAcc simulation.Account, action string, msg bank.MsgSend, abort bool) {
|
||||||
fromAcc = simulation.RandomAcc(r, accs)
|
fromAcc = simulation.RandomAcc(r, accs)
|
||||||
toAcc := simulation.RandomAcc(r, accs)
|
toAcc := simulation.RandomAcc(r, accs)
|
||||||
// Disallow sending money to yourself
|
// Disallow sending money to yourself
|
||||||
|
@ -92,7 +92,7 @@ func createSingleInputSendMsg(r *rand.Rand, ctx sdk.Context, accs []simulation.A
|
||||||
|
|
||||||
// Sends and verifies the transition of a msg send. This fails if there are repeated inputs or outputs
|
// Sends and verifies the transition of a msg send. This fails if there are repeated inputs or outputs
|
||||||
// pass in handler as nil to handle txs, otherwise handle msgs
|
// pass in handler as nil to handle txs, otherwise handle msgs
|
||||||
func sendAndVerifyMsgSend(app *baseapp.BaseApp, mapper auth.AccountMapper, msg bank.MsgSend, ctx sdk.Context, privkeys []crypto.PrivKey, handler sdk.Handler) error {
|
func sendAndVerifyMsgSend(app *baseapp.BaseApp, mapper auth.AccountKeeper, msg bank.MsgSend, ctx sdk.Context, privkeys []crypto.PrivKey, handler sdk.Handler) error {
|
||||||
initialInputAddrCoins := make([]sdk.Coins, len(msg.Inputs))
|
initialInputAddrCoins := make([]sdk.Coins, len(msg.Inputs))
|
||||||
initialOutputAddrCoins := make([]sdk.Coins, len(msg.Outputs))
|
initialOutputAddrCoins := make([]sdk.Coins, len(msg.Outputs))
|
||||||
AccountNumbers := make([]int64, len(msg.Inputs))
|
AccountNumbers := make([]int64, len(msg.Inputs))
|
||||||
|
|
|
@ -15,7 +15,7 @@ func TestBankWithRandomMessages(t *testing.T) {
|
||||||
mapp := mock.NewApp()
|
mapp := mock.NewApp()
|
||||||
|
|
||||||
bank.RegisterCodec(mapp.Cdc)
|
bank.RegisterCodec(mapp.Cdc)
|
||||||
mapper := mapp.AccountMapper
|
mapper := mapp.AccountKeeper
|
||||||
bankKeeper := bank.NewBaseKeeper(mapper)
|
bankKeeper := bank.NewBaseKeeper(mapper)
|
||||||
mapp.Router().AddRoute("bank", bank.NewHandler(bankKeeper))
|
mapp.Router().AddRoute("bank", bank.NewHandler(bankKeeper))
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ func MakeTestCodec() *codec.Codec {
|
||||||
|
|
||||||
// test input with default values
|
// test input with default values
|
||||||
func CreateTestInputDefault(t *testing.T, isCheckTx bool, initCoins int64) (
|
func CreateTestInputDefault(t *testing.T, isCheckTx bool, initCoins int64) (
|
||||||
sdk.Context, auth.AccountMapper, Keeper, stake.Keeper, DummyFeeCollectionKeeper) {
|
sdk.Context, auth.AccountKeeper, Keeper, stake.Keeper, DummyFeeCollectionKeeper) {
|
||||||
|
|
||||||
communityTax := sdk.NewDecWithPrec(2, 2)
|
communityTax := sdk.NewDecWithPrec(2, 2)
|
||||||
return CreateTestInputAdvanced(t, isCheckTx, initCoins, communityTax)
|
return CreateTestInputAdvanced(t, isCheckTx, initCoins, communityTax)
|
||||||
|
@ -81,7 +81,7 @@ func CreateTestInputDefault(t *testing.T, isCheckTx bool, initCoins int64) (
|
||||||
// hogpodge of all sorts of input required for testing
|
// hogpodge of all sorts of input required for testing
|
||||||
func CreateTestInputAdvanced(t *testing.T, isCheckTx bool, initCoins int64,
|
func CreateTestInputAdvanced(t *testing.T, isCheckTx bool, initCoins int64,
|
||||||
communityTax sdk.Dec) (
|
communityTax sdk.Dec) (
|
||||||
sdk.Context, auth.AccountMapper, Keeper, stake.Keeper, DummyFeeCollectionKeeper) {
|
sdk.Context, auth.AccountKeeper, Keeper, stake.Keeper, DummyFeeCollectionKeeper) {
|
||||||
|
|
||||||
keyDistr := sdk.NewKVStoreKey("distr")
|
keyDistr := sdk.NewKVStoreKey("distr")
|
||||||
keyStake := sdk.NewKVStoreKey("stake")
|
keyStake := sdk.NewKVStoreKey("stake")
|
||||||
|
@ -109,8 +109,8 @@ func CreateTestInputAdvanced(t *testing.T, isCheckTx bool, initCoins int64,
|
||||||
pk := params.NewKeeper(cdc, keyParams, tkeyParams)
|
pk := params.NewKeeper(cdc, keyParams, tkeyParams)
|
||||||
|
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "foochainid"}, isCheckTx, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "foochainid"}, isCheckTx, log.NewNopLogger())
|
||||||
accountMapper := auth.NewAccountMapper(cdc, keyAcc, auth.ProtoBaseAccount)
|
accountKeeper := auth.NewAccountKeeper(cdc, keyAcc, auth.ProtoBaseAccount)
|
||||||
ck := bank.NewBaseKeeper(accountMapper)
|
ck := bank.NewBaseKeeper(accountKeeper)
|
||||||
sk := stake.NewKeeper(cdc, keyStake, tkeyStake, ck, pk.Subspace(stake.DefaultParamspace), stake.DefaultCodespace)
|
sk := stake.NewKeeper(cdc, keyStake, tkeyStake, ck, pk.Subspace(stake.DefaultParamspace), stake.DefaultCodespace)
|
||||||
sk.SetPool(ctx, stake.InitialPool())
|
sk.SetPool(ctx, stake.InitialPool())
|
||||||
sk.SetParams(ctx, stake.DefaultParams())
|
sk.SetParams(ctx, stake.DefaultParams())
|
||||||
|
@ -139,7 +139,7 @@ func CreateTestInputAdvanced(t *testing.T, isCheckTx bool, initCoins int64,
|
||||||
keeper.SetBaseProposerReward(ctx, sdk.NewDecWithPrec(1, 2))
|
keeper.SetBaseProposerReward(ctx, sdk.NewDecWithPrec(1, 2))
|
||||||
keeper.SetBonusProposerReward(ctx, sdk.NewDecWithPrec(4, 2))
|
keeper.SetBonusProposerReward(ctx, sdk.NewDecWithPrec(4, 2))
|
||||||
|
|
||||||
return ctx, accountMapper, keeper, sk, fck
|
return ctx, accountKeeper, keeper, sk, fck
|
||||||
}
|
}
|
||||||
|
|
||||||
//__________________________________________________________________________________
|
//__________________________________________________________________________________
|
||||||
|
|
|
@ -111,14 +111,14 @@ func (keeper Keeper) GetProposal(ctx sdk.Context, proposalID int64) Proposal {
|
||||||
return proposal
|
return proposal
|
||||||
}
|
}
|
||||||
|
|
||||||
// Implements sdk.AccountMapper.
|
// Implements sdk.AccountKeeper.
|
||||||
func (keeper Keeper) SetProposal(ctx sdk.Context, proposal Proposal) {
|
func (keeper Keeper) SetProposal(ctx sdk.Context, proposal Proposal) {
|
||||||
store := ctx.KVStore(keeper.storeKey)
|
store := ctx.KVStore(keeper.storeKey)
|
||||||
bz := keeper.cdc.MustMarshalBinary(proposal)
|
bz := keeper.cdc.MustMarshalBinary(proposal)
|
||||||
store.Set(KeyProposal(proposal.GetProposalID()), bz)
|
store.Set(KeyProposal(proposal.GetProposalID()), bz)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Implements sdk.AccountMapper.
|
// Implements sdk.AccountKeeper.
|
||||||
func (keeper Keeper) DeleteProposal(ctx sdk.Context, proposal Proposal) {
|
func (keeper Keeper) DeleteProposal(ctx sdk.Context, proposal Proposal) {
|
||||||
store := ctx.KVStore(keeper.storeKey)
|
store := ctx.KVStore(keeper.storeKey)
|
||||||
store.Delete(KeyProposal(proposal.GetProposalID()))
|
store.Delete(KeyProposal(proposal.GetProposalID()))
|
||||||
|
|
|
@ -22,7 +22,7 @@ func TestGovWithRandomMessages(t *testing.T) {
|
||||||
|
|
||||||
bank.RegisterCodec(mapp.Cdc)
|
bank.RegisterCodec(mapp.Cdc)
|
||||||
gov.RegisterCodec(mapp.Cdc)
|
gov.RegisterCodec(mapp.Cdc)
|
||||||
mapper := mapp.AccountMapper
|
mapper := mapp.AccountKeeper
|
||||||
|
|
||||||
bankKeeper := bank.NewBaseKeeper(mapper)
|
bankKeeper := bank.NewBaseKeeper(mapper)
|
||||||
stakeKey := sdk.NewKVStoreKey("stake")
|
stakeKey := sdk.NewKVStoreKey("stake")
|
||||||
|
|
|
@ -33,7 +33,7 @@ func getMockApp(t *testing.T, numGenAccs int) (*mock.App, Keeper, stake.Keeper,
|
||||||
keyGov := sdk.NewKVStoreKey("gov")
|
keyGov := sdk.NewKVStoreKey("gov")
|
||||||
|
|
||||||
pk := params.NewKeeper(mapp.Cdc, keyGlobalParams, tkeyGlobalParams)
|
pk := params.NewKeeper(mapp.Cdc, keyGlobalParams, tkeyGlobalParams)
|
||||||
ck := bank.NewBaseKeeper(mapp.AccountMapper)
|
ck := bank.NewBaseKeeper(mapp.AccountKeeper)
|
||||||
sk := stake.NewKeeper(mapp.Cdc, keyStake, tkeyStake, ck, pk.Subspace(stake.DefaultParamspace), mapp.RegisterCodespace(stake.DefaultCodespace))
|
sk := stake.NewKeeper(mapp.Cdc, keyStake, tkeyStake, ck, pk.Subspace(stake.DefaultParamspace), mapp.RegisterCodespace(stake.DefaultCodespace))
|
||||||
keeper := NewKeeper(mapp.Cdc, keyGov, pk, pk.Subspace("testgov"), ck, sk, DefaultCodespace)
|
keeper := NewKeeper(mapp.Cdc, keyGov, pk, pk.Subspace("testgov"), ck, sk, DefaultCodespace)
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ func getMockApp(t *testing.T) *mock.App {
|
||||||
RegisterCodec(mapp.Cdc)
|
RegisterCodec(mapp.Cdc)
|
||||||
keyIBC := sdk.NewKVStoreKey("ibc")
|
keyIBC := sdk.NewKVStoreKey("ibc")
|
||||||
ibcMapper := NewMapper(mapp.Cdc, keyIBC, mapp.RegisterCodespace(DefaultCodespace))
|
ibcMapper := NewMapper(mapp.Cdc, keyIBC, mapp.RegisterCodespace(DefaultCodespace))
|
||||||
bankKeeper := bank.NewBaseKeeper(mapp.AccountMapper)
|
bankKeeper := bank.NewBaseKeeper(mapp.AccountKeeper)
|
||||||
mapp.Router().AddRoute("ibc", NewHandler(ibcMapper, bankKeeper))
|
mapp.Router().AddRoute("ibc", NewHandler(ibcMapper, bankKeeper))
|
||||||
|
|
||||||
require.NoError(t, mapp.CompleteSetup(keyIBC))
|
require.NoError(t, mapp.CompleteSetup(keyIBC))
|
||||||
|
@ -49,7 +49,7 @@ func TestIBCMsgs(t *testing.T) {
|
||||||
|
|
||||||
// A checkTx context (true)
|
// A checkTx context (true)
|
||||||
ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{})
|
ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{})
|
||||||
res1 := mapp.AccountMapper.GetAccount(ctxCheck, addr1)
|
res1 := mapp.AccountKeeper.GetAccount(ctxCheck, addr1)
|
||||||
require.Equal(t, acc, res1)
|
require.Equal(t, acc, res1)
|
||||||
|
|
||||||
packet := IBCPacket{
|
packet := IBCPacket{
|
||||||
|
|
|
@ -17,7 +17,7 @@ import (
|
||||||
"github.com/cosmos/cosmos-sdk/x/bank"
|
"github.com/cosmos/cosmos-sdk/x/bank"
|
||||||
)
|
)
|
||||||
|
|
||||||
// AccountMapper(/Keeper) and IBCMapper should use different StoreKey later
|
// AccountKeeper(/Keeper) and IBCMapper should use different StoreKey later
|
||||||
|
|
||||||
func defaultContext(key sdk.StoreKey) sdk.Context {
|
func defaultContext(key sdk.StoreKey) sdk.Context {
|
||||||
db := dbm.NewMemDB()
|
db := dbm.NewMemDB()
|
||||||
|
@ -64,7 +64,7 @@ func TestIBC(t *testing.T) {
|
||||||
key := sdk.NewKVStoreKey("ibc")
|
key := sdk.NewKVStoreKey("ibc")
|
||||||
ctx := defaultContext(key)
|
ctx := defaultContext(key)
|
||||||
|
|
||||||
am := auth.NewAccountMapper(cdc, key, auth.ProtoBaseAccount)
|
am := auth.NewAccountKeeper(cdc, key, auth.ProtoBaseAccount)
|
||||||
ck := bank.NewBaseKeeper(am)
|
ck := bank.NewBaseKeeper(am)
|
||||||
|
|
||||||
src := newAddress()
|
src := newAddress()
|
||||||
|
|
|
@ -29,7 +29,7 @@ type App struct {
|
||||||
KeyAccount *sdk.KVStoreKey
|
KeyAccount *sdk.KVStoreKey
|
||||||
|
|
||||||
// TODO: Abstract this out from not needing to be auth specifically
|
// TODO: Abstract this out from not needing to be auth specifically
|
||||||
AccountMapper auth.AccountMapper
|
AccountKeeper auth.AccountKeeper
|
||||||
FeeCollectionKeeper auth.FeeCollectionKeeper
|
FeeCollectionKeeper auth.FeeCollectionKeeper
|
||||||
|
|
||||||
GenesisAccounts []auth.Account
|
GenesisAccounts []auth.Account
|
||||||
|
@ -57,8 +57,8 @@ func NewApp() *App {
|
||||||
TotalCoinsSupply: sdk.Coins{},
|
TotalCoinsSupply: sdk.Coins{},
|
||||||
}
|
}
|
||||||
|
|
||||||
// Define the accountMapper
|
// Define the accountKeeper
|
||||||
app.AccountMapper = auth.NewAccountMapper(
|
app.AccountKeeper = auth.NewAccountKeeper(
|
||||||
app.Cdc,
|
app.Cdc,
|
||||||
app.KeyAccount,
|
app.KeyAccount,
|
||||||
auth.ProtoBaseAccount,
|
auth.ProtoBaseAccount,
|
||||||
|
@ -67,7 +67,7 @@ func NewApp() *App {
|
||||||
// Initialize the app. The chainers and blockers can be overwritten before
|
// Initialize the app. The chainers and blockers can be overwritten before
|
||||||
// calling complete setup.
|
// calling complete setup.
|
||||||
app.SetInitChainer(app.InitChainer)
|
app.SetInitChainer(app.InitChainer)
|
||||||
app.SetAnteHandler(auth.NewAnteHandler(app.AccountMapper, app.FeeCollectionKeeper))
|
app.SetAnteHandler(auth.NewAnteHandler(app.AccountKeeper, app.FeeCollectionKeeper))
|
||||||
|
|
||||||
// Not sealing for custom extension
|
// Not sealing for custom extension
|
||||||
|
|
||||||
|
@ -101,9 +101,9 @@ func (app *App) CompleteSetup(newKeys ...sdk.StoreKey) error {
|
||||||
func (app *App) InitChainer(ctx sdk.Context, _ abci.RequestInitChain) abci.ResponseInitChain {
|
func (app *App) InitChainer(ctx sdk.Context, _ abci.RequestInitChain) abci.ResponseInitChain {
|
||||||
// Load the genesis accounts
|
// Load the genesis accounts
|
||||||
for _, genacc := range app.GenesisAccounts {
|
for _, genacc := range app.GenesisAccounts {
|
||||||
acc := app.AccountMapper.NewAccountWithAddress(ctx, genacc.GetAddress())
|
acc := app.AccountKeeper.NewAccountWithAddress(ctx, genacc.GetAddress())
|
||||||
acc.SetCoins(genacc.GetCoins())
|
acc.SetCoins(genacc.GetCoins())
|
||||||
app.AccountMapper.SetAccount(ctx, acc)
|
app.AccountKeeper.SetAccount(ctx, acc)
|
||||||
}
|
}
|
||||||
|
|
||||||
return abci.ResponseInitChain{}
|
return abci.ResponseInitChain{}
|
||||||
|
@ -247,8 +247,8 @@ func RandomSetGenesis(r *rand.Rand, app *App, addrs []sdk.AccAddress, denoms []s
|
||||||
app.GenesisAccounts = accts
|
app.GenesisAccounts = accts
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetAllAccounts returns all accounts in the accountMapper.
|
// GetAllAccounts returns all accounts in the accountKeeper.
|
||||||
func GetAllAccounts(mapper auth.AccountMapper, ctx sdk.Context) []auth.Account {
|
func GetAllAccounts(mapper auth.AccountKeeper, ctx sdk.Context) []auth.Account {
|
||||||
accounts := []auth.Account{}
|
accounts := []auth.Account{}
|
||||||
appendAccount := func(acc auth.Account) (stop bool) {
|
appendAccount := func(acc auth.Account) (stop bool) {
|
||||||
accounts = append(accounts, acc)
|
accounts = append(accounts, acc)
|
||||||
|
|
|
@ -56,7 +56,7 @@ func TestCheckAndDeliverGenTx(t *testing.T) {
|
||||||
|
|
||||||
msg := testMsg{signers: []sdk.AccAddress{addrs[0]}, positiveNum: 1}
|
msg := testMsg{signers: []sdk.AccAddress{addrs[0]}, positiveNum: 1}
|
||||||
|
|
||||||
acct := mApp.AccountMapper.GetAccount(ctxCheck, addrs[0])
|
acct := mApp.AccountKeeper.GetAccount(ctxCheck, addrs[0])
|
||||||
require.Equal(t, accs[0], acct.(*auth.BaseAccount))
|
require.Equal(t, accs[0], acct.(*auth.BaseAccount))
|
||||||
|
|
||||||
SignCheckDeliver(
|
SignCheckDeliver(
|
||||||
|
|
|
@ -41,7 +41,7 @@ func RandFromBigInterval(r *rand.Rand, intervals []BigInterval) sdk.Int {
|
||||||
// CheckBalance checks the balance of an account.
|
// CheckBalance checks the balance of an account.
|
||||||
func CheckBalance(t *testing.T, app *App, addr sdk.AccAddress, exp sdk.Coins) {
|
func CheckBalance(t *testing.T, app *App, addr sdk.AccAddress, exp sdk.Coins) {
|
||||||
ctxCheck := app.BaseApp.NewContext(true, abci.Header{})
|
ctxCheck := app.BaseApp.NewContext(true, abci.Header{})
|
||||||
res := app.AccountMapper.GetAccount(ctxCheck, addr)
|
res := app.AccountKeeper.GetAccount(ctxCheck, addr)
|
||||||
|
|
||||||
require.Equal(t, exp, res.GetCoins())
|
require.Equal(t, exp, res.GetCoins())
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,7 +31,7 @@ func getMockApp(t *testing.T) (*mock.App, stake.Keeper, Keeper) {
|
||||||
|
|
||||||
keyParams := sdk.NewKVStoreKey("params")
|
keyParams := sdk.NewKVStoreKey("params")
|
||||||
tkeyParams := sdk.NewTransientStoreKey("transient_params")
|
tkeyParams := sdk.NewTransientStoreKey("transient_params")
|
||||||
bankKeeper := bank.NewBaseKeeper(mapp.AccountMapper)
|
bankKeeper := bank.NewBaseKeeper(mapp.AccountKeeper)
|
||||||
|
|
||||||
paramsKeeper := params.NewKeeper(mapp.Cdc, keyParams, tkeyParams)
|
paramsKeeper := params.NewKeeper(mapp.Cdc, keyParams, tkeyParams)
|
||||||
stakeKeeper := stake.NewKeeper(mapp.Cdc, keyStake, tkeyStake, bankKeeper, paramsKeeper.Subspace(stake.DefaultParamspace), mapp.RegisterCodespace(stake.DefaultCodespace))
|
stakeKeeper := stake.NewKeeper(mapp.Cdc, keyStake, tkeyStake, bankKeeper, paramsKeeper.Subspace(stake.DefaultParamspace), mapp.RegisterCodespace(stake.DefaultCodespace))
|
||||||
|
|
|
@ -68,9 +68,9 @@ func createTestInput(t *testing.T, defaults Params) (sdk.Context, bank.Keeper, s
|
||||||
require.Nil(t, err)
|
require.Nil(t, err)
|
||||||
ctx := sdk.NewContext(ms, abci.Header{Time: time.Unix(0, 0)}, false, log.NewTMLogger(os.Stdout))
|
ctx := sdk.NewContext(ms, abci.Header{Time: time.Unix(0, 0)}, false, log.NewTMLogger(os.Stdout))
|
||||||
cdc := createTestCodec()
|
cdc := createTestCodec()
|
||||||
accountMapper := auth.NewAccountMapper(cdc, keyAcc, auth.ProtoBaseAccount)
|
accountKeeper := auth.NewAccountKeeper(cdc, keyAcc, auth.ProtoBaseAccount)
|
||||||
|
|
||||||
ck := bank.NewBaseKeeper(accountMapper)
|
ck := bank.NewBaseKeeper(accountKeeper)
|
||||||
paramsKeeper := params.NewKeeper(cdc, keyParams, tkeyParams)
|
paramsKeeper := params.NewKeeper(cdc, keyParams, tkeyParams)
|
||||||
sk := stake.NewKeeper(cdc, keyStake, tkeyStake, ck, paramsKeeper.Subspace(stake.DefaultParamspace), stake.DefaultCodespace)
|
sk := stake.NewKeeper(cdc, keyStake, tkeyStake, ck, paramsKeeper.Subspace(stake.DefaultParamspace), stake.DefaultCodespace)
|
||||||
genesis := stake.DefaultGenesisState()
|
genesis := stake.DefaultGenesisState()
|
||||||
|
|
|
@ -24,7 +24,7 @@ func getMockApp(t *testing.T) (*mock.App, Keeper) {
|
||||||
keyParams := sdk.NewKVStoreKey("params")
|
keyParams := sdk.NewKVStoreKey("params")
|
||||||
tkeyParams := sdk.NewTransientStoreKey("transient_params")
|
tkeyParams := sdk.NewTransientStoreKey("transient_params")
|
||||||
|
|
||||||
bankKeeper := bank.NewBaseKeeper(mApp.AccountMapper)
|
bankKeeper := bank.NewBaseKeeper(mApp.AccountKeeper)
|
||||||
pk := params.NewKeeper(mApp.Cdc, keyParams, tkeyParams)
|
pk := params.NewKeeper(mApp.Cdc, keyParams, tkeyParams)
|
||||||
|
|
||||||
keeper := NewKeeper(mApp.Cdc, keyStake, tkeyStake, bankKeeper, pk.Subspace(DefaultParamspace), mApp.RegisterCodespace(DefaultCodespace))
|
keeper := NewKeeper(mApp.Cdc, keyStake, tkeyStake, bankKeeper, pk.Subspace(DefaultParamspace), mApp.RegisterCodespace(DefaultCodespace))
|
||||||
|
|
|
@ -74,7 +74,7 @@ func MakeTestCodec() *codec.Codec {
|
||||||
}
|
}
|
||||||
|
|
||||||
// hogpodge of all sorts of input required for testing
|
// hogpodge of all sorts of input required for testing
|
||||||
func CreateTestInput(t *testing.T, isCheckTx bool, initCoins int64) (sdk.Context, auth.AccountMapper, Keeper) {
|
func CreateTestInput(t *testing.T, isCheckTx bool, initCoins int64) (sdk.Context, auth.AccountKeeper, Keeper) {
|
||||||
|
|
||||||
keyStake := sdk.NewKVStoreKey("stake")
|
keyStake := sdk.NewKVStoreKey("stake")
|
||||||
tkeyStake := sdk.NewTransientStoreKey("transient_stake")
|
tkeyStake := sdk.NewTransientStoreKey("transient_stake")
|
||||||
|
@ -94,13 +94,13 @@ func CreateTestInput(t *testing.T, isCheckTx bool, initCoins int64) (sdk.Context
|
||||||
|
|
||||||
ctx := sdk.NewContext(ms, abci.Header{ChainID: "foochainid"}, isCheckTx, log.NewNopLogger())
|
ctx := sdk.NewContext(ms, abci.Header{ChainID: "foochainid"}, isCheckTx, log.NewNopLogger())
|
||||||
cdc := MakeTestCodec()
|
cdc := MakeTestCodec()
|
||||||
accountMapper := auth.NewAccountMapper(
|
accountKeeper := auth.NewAccountKeeper(
|
||||||
cdc, // amino codec
|
cdc, // amino codec
|
||||||
keyAcc, // target store
|
keyAcc, // target store
|
||||||
auth.ProtoBaseAccount, // prototype
|
auth.ProtoBaseAccount, // prototype
|
||||||
)
|
)
|
||||||
|
|
||||||
ck := bank.NewBaseKeeper(accountMapper)
|
ck := bank.NewBaseKeeper(accountKeeper)
|
||||||
|
|
||||||
pk := params.NewKeeper(cdc, keyParams, tkeyParams)
|
pk := params.NewKeeper(cdc, keyParams, tkeyParams)
|
||||||
keeper := NewKeeper(cdc, keyStake, tkeyStake, ck, pk.Subspace(DefaultParamspace), types.DefaultCodespace)
|
keeper := NewKeeper(cdc, keyStake, tkeyStake, ck, pk.Subspace(DefaultParamspace), types.DefaultCodespace)
|
||||||
|
@ -119,7 +119,7 @@ func CreateTestInput(t *testing.T, isCheckTx bool, initCoins int64) (sdk.Context
|
||||||
keeper.SetPool(ctx, pool)
|
keeper.SetPool(ctx, pool)
|
||||||
}
|
}
|
||||||
|
|
||||||
return ctx, accountMapper, keeper
|
return ctx, accountKeeper, keeper
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewPubKey(pk string) (res crypto.PubKey) {
|
func NewPubKey(pk string) (res crypto.PubKey) {
|
||||||
|
|
|
@ -14,7 +14,7 @@ import (
|
||||||
|
|
||||||
// AllInvariants runs all invariants of the stake module.
|
// AllInvariants runs all invariants of the stake module.
|
||||||
// Currently: total supply, positive power
|
// Currently: total supply, positive power
|
||||||
func AllInvariants(ck bank.Keeper, k stake.Keeper, am auth.AccountMapper) simulation.Invariant {
|
func AllInvariants(ck bank.Keeper, k stake.Keeper, am auth.AccountKeeper) simulation.Invariant {
|
||||||
return func(app *baseapp.BaseApp) error {
|
return func(app *baseapp.BaseApp) error {
|
||||||
err := SupplyInvariants(ck, k, am)(app)
|
err := SupplyInvariants(ck, k, am)(app)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -31,7 +31,7 @@ func AllInvariants(ck bank.Keeper, k stake.Keeper, am auth.AccountMapper) simula
|
||||||
|
|
||||||
// SupplyInvariants checks that the total supply reflects all held loose tokens, bonded tokens, and unbonding delegations
|
// SupplyInvariants checks that the total supply reflects all held loose tokens, bonded tokens, and unbonding delegations
|
||||||
// nolint: unparam
|
// nolint: unparam
|
||||||
func SupplyInvariants(ck bank.Keeper, k stake.Keeper, am auth.AccountMapper) simulation.Invariant {
|
func SupplyInvariants(ck bank.Keeper, k stake.Keeper, am auth.AccountKeeper) simulation.Invariant {
|
||||||
return func(app *baseapp.BaseApp) error {
|
return func(app *baseapp.BaseApp) error {
|
||||||
ctx := app.NewContext(false, abci.Header{})
|
ctx := app.NewContext(false, abci.Header{})
|
||||||
pool := k.GetPool(ctx)
|
pool := k.GetPool(ctx)
|
||||||
|
|
|
@ -14,7 +14,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// SimulateMsgCreateValidator
|
// SimulateMsgCreateValidator
|
||||||
func SimulateMsgCreateValidator(m auth.AccountMapper, k stake.Keeper) simulation.Operation {
|
func SimulateMsgCreateValidator(m auth.AccountKeeper, k stake.Keeper) simulation.Operation {
|
||||||
handler := stake.NewHandler(k)
|
handler := stake.NewHandler(k)
|
||||||
return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context,
|
return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context,
|
||||||
accs []simulation.Account, event func(string)) (
|
accs []simulation.Account, event func(string)) (
|
||||||
|
@ -111,7 +111,7 @@ func SimulateMsgEditValidator(k stake.Keeper) simulation.Operation {
|
||||||
}
|
}
|
||||||
|
|
||||||
// SimulateMsgDelegate
|
// SimulateMsgDelegate
|
||||||
func SimulateMsgDelegate(m auth.AccountMapper, k stake.Keeper) simulation.Operation {
|
func SimulateMsgDelegate(m auth.AccountKeeper, k stake.Keeper) simulation.Operation {
|
||||||
handler := stake.NewHandler(k)
|
handler := stake.NewHandler(k)
|
||||||
return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context,
|
return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context,
|
||||||
accs []simulation.Account, event func(string)) (
|
accs []simulation.Account, event func(string)) (
|
||||||
|
@ -149,7 +149,7 @@ func SimulateMsgDelegate(m auth.AccountMapper, k stake.Keeper) simulation.Operat
|
||||||
}
|
}
|
||||||
|
|
||||||
// SimulateMsgBeginUnbonding
|
// SimulateMsgBeginUnbonding
|
||||||
func SimulateMsgBeginUnbonding(m auth.AccountMapper, k stake.Keeper) simulation.Operation {
|
func SimulateMsgBeginUnbonding(m auth.AccountKeeper, k stake.Keeper) simulation.Operation {
|
||||||
handler := stake.NewHandler(k)
|
handler := stake.NewHandler(k)
|
||||||
return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context,
|
return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context,
|
||||||
accs []simulation.Account, event func(string)) (
|
accs []simulation.Account, event func(string)) (
|
||||||
|
@ -187,7 +187,7 @@ func SimulateMsgBeginUnbonding(m auth.AccountMapper, k stake.Keeper) simulation.
|
||||||
}
|
}
|
||||||
|
|
||||||
// SimulateMsgBeginRedelegate
|
// SimulateMsgBeginRedelegate
|
||||||
func SimulateMsgBeginRedelegate(m auth.AccountMapper, k stake.Keeper) simulation.Operation {
|
func SimulateMsgBeginRedelegate(m auth.AccountKeeper, k stake.Keeper) simulation.Operation {
|
||||||
handler := stake.NewHandler(k)
|
handler := stake.NewHandler(k)
|
||||||
return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context,
|
return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context,
|
||||||
accs []simulation.Account, event func(string)) (
|
accs []simulation.Account, event func(string)) (
|
||||||
|
@ -238,10 +238,10 @@ func Setup(mapp *mock.App, k stake.Keeper) simulation.RandSetup {
|
||||||
params := k.GetParams(ctx)
|
params := k.GetParams(ctx)
|
||||||
denom := params.BondDenom
|
denom := params.BondDenom
|
||||||
loose := sdk.ZeroInt()
|
loose := sdk.ZeroInt()
|
||||||
mapp.AccountMapper.IterateAccounts(ctx, func(acc auth.Account) bool {
|
mapp.AccountKeeper.IterateAccounts(ctx, func(acc auth.Account) bool {
|
||||||
balance := simulation.RandomAmount(r, sdk.NewInt(1000000))
|
balance := simulation.RandomAmount(r, sdk.NewInt(1000000))
|
||||||
acc.SetCoins(acc.GetCoins().Plus(sdk.Coins{sdk.NewCoin(denom, balance)}))
|
acc.SetCoins(acc.GetCoins().Plus(sdk.Coins{sdk.NewCoin(denom, balance)}))
|
||||||
mapp.AccountMapper.SetAccount(ctx, acc)
|
mapp.AccountKeeper.SetAccount(ctx, acc)
|
||||||
loose = loose.Add(balance)
|
loose = loose.Add(balance)
|
||||||
return false
|
return false
|
||||||
})
|
})
|
||||||
|
|
|
@ -20,7 +20,7 @@ func TestStakeWithRandomMessages(t *testing.T) {
|
||||||
mapp := mock.NewApp()
|
mapp := mock.NewApp()
|
||||||
|
|
||||||
bank.RegisterCodec(mapp.Cdc)
|
bank.RegisterCodec(mapp.Cdc)
|
||||||
mapper := mapp.AccountMapper
|
mapper := mapp.AccountKeeper
|
||||||
bankKeeper := bank.NewBaseKeeper(mapper)
|
bankKeeper := bank.NewBaseKeeper(mapper)
|
||||||
stakeKey := sdk.NewKVStoreKey("stake")
|
stakeKey := sdk.NewKVStoreKey("stake")
|
||||||
stakeTKey := sdk.NewTransientStoreKey("transient_stake")
|
stakeTKey := sdk.NewTransientStoreKey("transient_stake")
|
||||||
|
@ -58,7 +58,7 @@ func TestStakeWithRandomMessages(t *testing.T) {
|
||||||
}, []simulation.RandSetup{
|
}, []simulation.RandSetup{
|
||||||
Setup(mapp, stakeKeeper),
|
Setup(mapp, stakeKeeper),
|
||||||
}, []simulation.Invariant{
|
}, []simulation.Invariant{
|
||||||
AllInvariants(bankKeeper, stakeKeeper, mapp.AccountMapper),
|
AllInvariants(bankKeeper, stakeKeeper, mapp.AccountKeeper),
|
||||||
}, 10, 100,
|
}, 10, 100,
|
||||||
false,
|
false,
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue