diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-10-15 17:38:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-15 17:38:21 +0800 |
| commit | ef9265d0d7abf6614c1d2fb977989ab0d400a590 (patch) | |
| tree | 703c2b72c0c86a8f6144acd6449a633fb2b1d3a2 /eth | |
| parent | 5a6008e004a6611d7a478495d083eaf26e52c5f1 (diff) | |
| parent | ac0c5dd77f60d91b8cefef307dbda0e6b0e877be (diff) | |
| download | go-tangerine-ef9265d0d7abf6614c1d2fb977989ab0d400a590.tar go-tangerine-ef9265d0d7abf6614c1d2fb977989ab0d400a590.tar.gz go-tangerine-ef9265d0d7abf6614c1d2fb977989ab0d400a590.tar.bz2 go-tangerine-ef9265d0d7abf6614c1d2fb977989ab0d400a590.tar.lz go-tangerine-ef9265d0d7abf6614c1d2fb977989ab0d400a590.tar.xz go-tangerine-ef9265d0d7abf6614c1d2fb977989ab0d400a590.tar.zst go-tangerine-ef9265d0d7abf6614c1d2fb977989ab0d400a590.zip | |
Merge pull request #3140 from karalabe/release/1.4
Geth 1.4.18: Note 7
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/downloader/downloader_test.go | 2 | ||||
| -rw-r--r-- | eth/handler.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index a2efc7469..4f921f353 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -286,7 +286,7 @@ func (dl *downloadTester) headFastBlock() *types.Block { func (dl *downloadTester) commitHeadBlock(hash common.Hash) error { // For now only check that the state trie is correct if block := dl.getBlock(hash); block != nil { - _, err := trie.NewSecure(block.Root(), dl.stateDb) + _, err := trie.NewSecure(block.Root(), dl.stateDb, 0) return err } return fmt.Errorf("non existent block: %x", hash[:4]) diff --git a/eth/handler.go b/eth/handler.go index 89418c0df..187291655 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -288,7 +288,7 @@ func (pm *ProtocolManager) handle(p *peer) error { } // Start a timer to disconnect if the peer doesn't reply in time p.forkDrop = time.AfterFunc(daoChallengeTimeout, func() { - glog.V(logger.Warn).Infof("%v: timed out DAO fork-check, dropping", p) + glog.V(logger.Debug).Infof("%v: timed out DAO fork-check, dropping", p) pm.removePeer(p.id) }) // Make sure it's cleaned up if the peer dies off |