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

Merge PR #1391: Remove Viper from ante handler 

No longer necessary.
This commit is contained in:
Christopher Goes 2018-06-27 00:05:51 +02:00 committed by GitHub
parent 4f57a765ad 8bdf06b9f6
commit 8778576b93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -31,7 +31,7 @@ FIXES
* \#1259 - fix bug where certain tests that could have a nil pointer in defer * \#1259 - fix bug where certain tests that could have a nil pointer in defer
* \#1052 - Make all now works * \#1052 - Make all now works
* Retry on HTTP request failure in CLI tests, add option to retry tests in Makefile * Retry on HTTP request failure in CLI tests, add option to retry tests in Makefile
* Fixed bug where chain ID wasn't passed properly in x/bank REST handler * Fixed bug where chain ID wasn't passed properly in x/bank REST handler, removed Viper hack from ante handler
* Fixed bug where `democli account` didn't decode the account data correctly * Fixed bug where `democli account` didn't decode the account data correctly
* \#1343 - fixed unnecessary parallelism in CI * \#1343 - fixed unnecessary parallelism in CI
* \#1353 - CLI: Show pool shares fractions in human-readable format * \#1353 - CLI: Show pool shares fractions in human-readable format

7
x/auth/ante.go
View File

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/spf13/viper"
) )
const ( const (
@ -72,12 +71,6 @@ func NewAnteHandler(am AccountMapper, fck FeeCollectionKeeper) sdk.AnteHandler {
accNums[i] = sigs[i].AccountNumber accNums[i] = sigs[i].AccountNumber
} }
fee := stdTx.Fee fee := stdTx.Fee
chainID := ctx.ChainID()
// XXX: major hack; need to get ChainID
// into the app right away (#565)
if chainID == "" {
chainID = viper.GetString("chain-id")
}
// Check sig and nonce and collect signer accounts. // Check sig and nonce and collect signer accounts.
var signerAccs = make([]Account, len(signerAddrs)) var signerAccs = make([]Account, len(signerAddrs))