aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-01-30 07:47:09 +0800
committerobscuren <geffobscura@gmail.com>2014-01-30 07:47:09 +0800
commit27a03d3eea5451ddb84dbb1ff33ee916259635d0 (patch)
tree3464e91b6ee6a6a4a661599a4d73c75f997fab63
parent6ab368cf7426195a0d44b14ad6d82c020c024395 (diff)
downloaddexon-27a03d3eea5451ddb84dbb1ff33ee916259635d0.tar.gz
dexon-27a03d3eea5451ddb84dbb1ff33ee916259635d0.tar.zst
dexon-27a03d3eea5451ddb84dbb1ff33ee916259635d0.zip
Updated to the new Trie
-rw-r--r--dev_console.go10
-rw-r--r--ethereum.go4
2 files changed, 7 insertions, 7 deletions
diff --git a/dev_console.go b/dev_console.go
index 74ba343cd..106c372f2 100644
--- a/dev_console.go
+++ b/dev_console.go
@@ -76,11 +76,11 @@ func (i *Console) ValidateInput(action string, argumentLength int) error {
}
func (i *Console) PrintRoot() {
- root := ethutil.Conv(i.trie.RootT)
+ root := ethutil.Conv(i.trie.Root)
if len(root.AsBytes()) != 0 {
fmt.Println(hex.EncodeToString(root.AsBytes()))
} else {
- fmt.Println(i.trie.RootT)
+ fmt.Println(i.trie.Root)
}
}
@@ -108,15 +108,15 @@ func (i *Console) ParseInput(input string) bool {
} else {
switch tokens[0] {
case "update":
- i.trie.UpdateT(tokens[1], tokens[2])
+ i.trie.Update(tokens[1], tokens[2])
i.PrintRoot()
case "get":
- fmt.Println(i.trie.GetT(tokens[1]))
+ fmt.Println(i.trie.Get(tokens[1]))
case "root":
i.PrintRoot()
case "rawroot":
- fmt.Println(i.trie.RootT)
+ fmt.Println(i.trie.Root)
case "print":
i.db.Print()
case "dag":
diff --git a/ethereum.go b/ethereum.go
index 8608ca47a..2ffb6c929 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -84,7 +84,7 @@ func main() {
ethereum.Start()
if StartMining {
- blockTime := time.Duration(2)
+ blockTime := time.Duration(10)
log.Printf("Dev Test Mining started. Blocks found each %d seconds\n", blockTime)
// Fake block mining. It broadcasts a new block every 5 seconds
@@ -107,7 +107,7 @@ func main() {
if err != nil {
log.Println(err)
} else {
- log.Println("\n+++++++ MINED BLK +++++++\n", block.String())
+ //log.Println("\n+++++++ MINED BLK +++++++\n", block.String())
}
}
}()