Merge pull request #1520 from obscuren/reward-5eth

core: 5 ether block reward

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
 }

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)

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 {