aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-01-28 22:35:19 +0800
committerobscuren <geffobscura@gmail.com>2014-01-28 22:35:19 +0800
commit6ab368cf7426195a0d44b14ad6d82c020c024395 (patch)
treed2ca5fc99fe3b76c80ad0e50e5f4da109fcc21b4
parent2619604549ee632289fbde2a3065fa8dcfe65a23 (diff)
downloaddexon-6ab368cf7426195a0d44b14ad6d82c020c024395.tar
dexon-6ab368cf7426195a0d44b14ad6d82c020c024395.tar.gz
dexon-6ab368cf7426195a0d44b14ad6d82c020c024395.tar.bz2
dexon-6ab368cf7426195a0d44b14ad6d82c020c024395.tar.lz
dexon-6ab368cf7426195a0d44b14ad6d82c020c024395.tar.xz
dexon-6ab368cf7426195a0d44b14ad6d82c020c024395.tar.zst
dexon-6ab368cf7426195a0d44b14ad6d82c020c024395.zip
Changed block chain specific methods
-rw-r--r--dev_console.go2
-rw-r--r--ethereum.go6
2 files changed, 4 insertions, 4 deletions
diff --git a/dev_console.go b/dev_console.go
index 91d911ec2..74ba343cd 100644
--- a/dev_console.go
+++ b/dev_console.go
@@ -128,7 +128,7 @@ func (i *Console) ParseInput(input string) bool {
fmt.Printf("%q\n", d)
case "getaddr":
encoded, _ := hex.DecodeString(tokens[1])
- d := i.ethereum.BlockManager.CurrentBlock.State().Get(string(encoded))
+ d := i.ethereum.BlockManager.BlockChain().CurrentBlock.State().Get(string(encoded))
if d != "" {
decoder := ethutil.NewRlpDecoder([]byte(d))
fmt.Println(decoder)
diff --git a/ethereum.go b/ethereum.go
index d58033cdc..8608ca47a 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -84,7 +84,7 @@ func main() {
ethereum.Start()
if StartMining {
- blockTime := time.Duration(15)
+ blockTime := time.Duration(2)
log.Printf("Dev Test Mining started. Blocks found each %d seconds\n", blockTime)
// Fake block mining. It broadcasts a new block every 5 seconds
@@ -96,8 +96,8 @@ func main() {
txs := ethereum.TxPool.Flush()
block := ethchain.CreateBlock(
- ethereum.BlockManager.CurrentBlock.State().Root,
- ethereum.BlockManager.LastBlockHash,
+ ethereum.BlockManager.BlockChain().CurrentBlock.State().Root,
+ ethereum.BlockManager.BlockChain().LastBlockHash,
"123",
big.NewInt(1),
big.NewInt(1),