diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-08 08:02:46 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-08 08:02:46 +0800 |
| commit | e189758d5519fa945c1a1b44295518ea99cb384e (patch) | |
| tree | 7e1fde78bfacd965c7566a7c899bba39d1b19ebc | |
| parent | 8ea0444655be19a9b3bb574b8e1282b361e0fcd5 (diff) | |
| parent | fca652eeeaef41efa7bc17ea2e182586324a1e52 (diff) | |
| download | go-tangerine-e189758d5519fa945c1a1b44295518ea99cb384e.tar go-tangerine-e189758d5519fa945c1a1b44295518ea99cb384e.tar.gz go-tangerine-e189758d5519fa945c1a1b44295518ea99cb384e.tar.bz2 go-tangerine-e189758d5519fa945c1a1b44295518ea99cb384e.tar.lz go-tangerine-e189758d5519fa945c1a1b44295518ea99cb384e.tar.xz go-tangerine-e189758d5519fa945c1a1b44295518ea99cb384e.tar.zst go-tangerine-e189758d5519fa945c1a1b44295518ea99cb384e.zip | |
Merge branch 'poc-9' of github.com-obscure:ethereum/go-ethereum into poc-9
| -rw-r--r-- | eth/protocol_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eth/protocol_test.go b/eth/protocol_test.go index c118e6aae..f499d033e 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - ethlogger "github.com/ethereum/go-ethereu/logger" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/errs" "github.com/ethereum/go-ethereum/ethutil" + ethlogger "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/discover" ) |