diff options
author | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-10-08 06:23:45 +0800 |
---|---|---|
committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-10-15 00:09:17 +0800 |
commit | 64af2aafdaf16d0bab4c2b89573324b076602bab (patch) | |
tree | fb8f5d30ce7ff12ee8f56c3621254edea55885be /tests/block_test_util.go | |
parent | eeb2a1a6e3c7a0c77ee6836f3103708cff4102ad (diff) | |
download | dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar.gz dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar.bz2 dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar.lz dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar.xz dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.tar.zst dexon-64af2aafdaf16d0bab4c2b89573324b076602bab.zip |
core, core/vm: added gas price variance table
This implements 1b & 1c of EIP150 by adding a new GasTable which must be
returned from the RuleSet config method. This table is used to determine
the gas prices for the current epoch.
Please note that when the CreateBySuicide gas price is set it is assumed
that we're in the new epoch phase.
In addition this PR will serve as temporary basis while refactorisation
in being done in the EVM64 PR, which will substentially overhaul the gas
price code.
Diffstat (limited to 'tests/block_test_util.go')
-rw-r--r-- | tests/block_test_util.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 7096b866d..010c8d4c0 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -104,7 +104,7 @@ type btTransaction struct { Value string } -func RunBlockTestWithReader(homesteadBlock, daoForkBlock *big.Int, r io.Reader, skipTests []string) error { +func RunBlockTestWithReader(homesteadBlock, daoForkBlock, gasPriceFork *big.Int, r io.Reader, skipTests []string) error { btjs := make(map[string]*btJSON) if err := readJson(r, &btjs); err != nil { return err @@ -115,13 +115,13 @@ func RunBlockTestWithReader(homesteadBlock, daoForkBlock *big.Int, r io.Reader, return err } - if err := runBlockTests(homesteadBlock, daoForkBlock, bt, skipTests); err != nil { + if err := runBlockTests(homesteadBlock, daoForkBlock, gasPriceFork, bt, skipTests); err != nil { return err } return nil } -func RunBlockTest(homesteadBlock, daoForkBlock *big.Int, file string, skipTests []string) error { +func RunBlockTest(homesteadBlock, daoForkBlock, gasPriceFork *big.Int, file string, skipTests []string) error { btjs := make(map[string]*btJSON) if err := readJsonFile(file, &btjs); err != nil { return err @@ -131,13 +131,13 @@ func RunBlockTest(homesteadBlock, daoForkBlock *big.Int, file string, skipTests if err != nil { return err } - if err := runBlockTests(homesteadBlock, daoForkBlock, bt, skipTests); err != nil { + if err := runBlockTests(homesteadBlock, daoForkBlock, gasPriceFork, bt, skipTests); err != nil { return err } return nil } -func runBlockTests(homesteadBlock, daoForkBlock *big.Int, bt map[string]*BlockTest, skipTests []string) error { +func runBlockTests(homesteadBlock, daoForkBlock, gasPriceFork *big.Int, bt map[string]*BlockTest, skipTests []string) error { skipTest := make(map[string]bool, len(skipTests)) for _, name := range skipTests { skipTest[name] = true @@ -149,7 +149,7 @@ func runBlockTests(homesteadBlock, daoForkBlock *big.Int, bt map[string]*BlockTe continue } // test the block - if err := runBlockTest(homesteadBlock, daoForkBlock, test); err != nil { + if err := runBlockTest(homesteadBlock, daoForkBlock, gasPriceFork, test); err != nil { return fmt.Errorf("%s: %v", name, err) } glog.Infoln("Block test passed: ", name) @@ -158,7 +158,7 @@ func runBlockTests(homesteadBlock, daoForkBlock *big.Int, bt map[string]*BlockTe return nil } -func runBlockTest(homesteadBlock, daoForkBlock *big.Int, test *BlockTest) error { +func runBlockTest(homesteadBlock, daoForkBlock, gasPriceFork *big.Int, test *BlockTest) error { // import pre accounts & construct test genesis block & state root db, _ := ethdb.NewMemDatabase() if _, err := test.InsertPreState(db); err != nil { @@ -170,7 +170,7 @@ func runBlockTest(homesteadBlock, daoForkBlock *big.Int, test *BlockTest) error core.WriteCanonicalHash(db, test.Genesis.Hash(), test.Genesis.NumberU64()) core.WriteHeadBlockHash(db, test.Genesis.Hash()) evmux := new(event.TypeMux) - config := &core.ChainConfig{HomesteadBlock: homesteadBlock, DAOForkBlock: daoForkBlock, DAOForkSupport: true} + config := &core.ChainConfig{HomesteadBlock: homesteadBlock, DAOForkBlock: daoForkBlock, DAOForkSupport: true, HomesteadGasRepriceBlock: gasPriceFork} chain, err := core.NewBlockChain(db, config, ethash.NewShared(), evmux) if err != nil { return err |