diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-25 23:57:33 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-25 23:57:33 +0800 |
| commit | 665eaff9b9076827d887342bf0a84d0f3ae37697 (patch) | |
| tree | 0fddd3261226e4336055c7a5c78802eeae7d9c9a | |
| parent | 0efcd7ed05331c25b3f3d485c65354cfe99d8297 (diff) | |
| parent | 9afda6ab8cb72269b299664a69edb545a5aebeb6 (diff) | |
| download | go-tangerine-665eaff9b9076827d887342bf0a84d0f3ae37697.tar go-tangerine-665eaff9b9076827d887342bf0a84d0f3ae37697.tar.gz go-tangerine-665eaff9b9076827d887342bf0a84d0f3ae37697.tar.bz2 go-tangerine-665eaff9b9076827d887342bf0a84d0f3ae37697.tar.lz go-tangerine-665eaff9b9076827d887342bf0a84d0f3ae37697.tar.xz go-tangerine-665eaff9b9076827d887342bf0a84d0f3ae37697.tar.zst go-tangerine-665eaff9b9076827d887342bf0a84d0f3ae37697.zip | |
Merge pull request #1520 from obscuren/reward-5eth
core: 5 ether block reward
| -rw-r--r-- | core/chain_makers_test.go | 2 | ||||
| -rw-r--r-- | core/fees.go | 2 | ||||
| -rw-r--r-- | tests/block_test.go | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index deb8be93f..edc0333be 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -93,5 +93,5 @@ func ExampleGenerateChain() { // last block: #5 // balance of addr1: 989000 // balance of addr2: 10000 - // balance of addr3: 5906250000000001000 + // balance of addr3: 19687500000000001000 } diff --git a/core/fees.go b/core/fees.go index 3f6177975..29ba5c5a6 100644 --- a/core/fees.go +++ b/core/fees.go @@ -20,4 +20,4 @@ import ( "math/big" ) -var BlockReward *big.Int = big.NewInt(1.5e+18) +var BlockReward *big.Int = big.NewInt(5e+18) diff --git a/tests/block_test.go b/tests/block_test.go index 40a210a3e..5019b758d 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -17,10 +17,18 @@ package tests import ( + "math/big" "path/filepath" "testing" + + "github.com/ethereum/go-ethereum/core" ) +func init() { + // XXX remove me when block tests have been updated + core.BlockReward = big.NewInt(1.5e+18) +} + func TestBcValidBlockTests(t *testing.T) { err := RunBlockTest(filepath.Join(blockTestDir, "bcValidBlockTest.json"), BlockSkipTests) if err != nil { |