Skip to content

Commit

Permalink
revert BaseAccount.PubKey fields and Marshal/UnmarshalJSONPB/JSON
Browse files Browse the repository at this point in the history
  • Loading branch information
torao committed Jul 11, 2022
1 parent fa0dc25 commit 8bbec1e
Show file tree
Hide file tree
Showing 11 changed files with 302 additions and 961 deletions.
2 changes: 1 addition & 1 deletion baseapp/block_gas_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
require.Equal(t, []byte("ok"), okValue)
}
// check block gas is always consumed
baseGas := uint64(35030) // baseGas is the gas consumed before tx msg
baseGas := uint64(40043) // baseGas is the gas consumed before tx msg
expGasConsumed := addUint64Saturating(tc.gasToConsume, baseGas)
if expGasConsumed > txtypes.MaxGasWanted {
// capped by gasLimit
Expand Down
Loading

0 comments on commit 8bbec1e

Please sign in to comment.