diff options
author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-03-04 21:04:07 +0800 |
---|---|---|
committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-03-04 21:04:07 +0800 |
commit | 5f25c117eb6a1145b18fc13ebc03e4dc570b908e (patch) | |
tree | f5296850d29c08179ac9f51c925463d880e2db08 /eth/protocol_test.go | |
parent | cf880f78d5e85d563654ac8277c1d51bf8c382c2 (diff) | |
parent | a56243075a7527d65d14c4cf3480029feb0a1e3f (diff) | |
download | dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.tar dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.tar.gz dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.tar.bz2 dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.tar.lz dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.tar.xz dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.tar.zst dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.zip |
Merge branch 'develop' into ui
Diffstat (limited to 'eth/protocol_test.go')
-rw-r--r-- | eth/protocol_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/protocol_test.go b/eth/protocol_test.go index a91806a1c..87d8974d5 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -12,12 +12,12 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" - ethlogger "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/discover" ) -var sys = ethlogger.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlogger.LogLevel(ethlogger.DebugDetailLevel)) +var sys = logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(logger.DebugDetailLevel)) type testMsgReadWriter struct { in chan p2p.Msg |