diff options
| author | obscuren <geffobscura@gmail.com> | 2014-11-19 02:52:45 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-11-19 02:52:45 +0800 |
| commit | 93e693be72e1a7734e826016316434c1e2320de9 (patch) | |
| tree | 2acf4eed441ca7aff4d40e13a0c81e26070756c0 | |
| parent | 675ba4d7eb7ab96fa74b803085f042a25f8d8d42 (diff) | |
| download | dexon-93e693be72e1a7734e826016316434c1e2320de9.tar.gz dexon-93e693be72e1a7734e826016316434c1e2320de9.tar.zst dexon-93e693be72e1a7734e826016316434c1e2320de9.zip | |
Fixed tests for 'types'
| -rw-r--r-- | chain/helper_test.go | 3 | ||||
| -rw-r--r-- | cmd/ethereum/main.go | 5 | ||||
| -rw-r--r-- | ptrie/trie_test.go | 2 | ||||
| -rw-r--r-- | trie/trie_test.go | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/chain/helper_test.go b/chain/helper_test.go index 459e3e63a..8c7532111 100644 --- a/chain/helper_test.go +++ b/chain/helper_test.go @@ -4,6 +4,7 @@ import ( "container/list" "fmt" + "github.com/ethereum/go-ethereum/chain/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethutil" @@ -19,7 +20,7 @@ type TestManager struct { db ethutil.Database txPool *TxPool blockChain *ChainManager - Blocks []*Block + Blocks []*types.Block } func (s *TestManager) IsListening() bool { diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index c894a8f85..aa933c4e7 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -21,8 +21,7 @@ import ( "fmt" "os" "runtime" - - "github.com/ethereum/go-ethereum/chain" + "github.com/ethereum/go-ethereum/chain/types" "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" @@ -74,7 +73,7 @@ func main() { ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer) if Dump { - var block *chain.Block + var block *types.Block if len(DumpHash) == 0 && DumpNumber == -1 { block = ethereum.ChainManager().CurrentBlock diff --git a/ptrie/trie_test.go b/ptrie/trie_test.go index 8b98f4408..6cdd2bde4 100644 --- a/ptrie/trie_test.go +++ b/ptrie/trie_test.go @@ -132,7 +132,7 @@ func BenchmarkUpdate(b *testing.B) { b.ResetTimer() for i := 0; i < b.N; i++ { - trie.UpdateString(fmt.Sprintf("aaaaaaaaa%d", base, i), "value") + trie.UpdateString(fmt.Sprintf("aaaaaaaaa%d", i), "value") } trie.Hash() } diff --git a/trie/trie_test.go b/trie/trie_test.go index 25eb1742f..207d41f30 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -1,12 +1,14 @@ package trie import ( + "bytes" "encoding/hex" "encoding/json" "fmt" "io/ioutil" "math/rand" "net/http" + "testing" "time" checker "gopkg.in/check.v1" |