From 50661f0e683b4975894a0e8fe16024724adef72d Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Thu, 19 Mar 2015 22:46:54 +0000
Subject:  peer suspension to disallow reconnect after disconnect on fatal
 error for set period (PeerSuspensionInterval)

---
 blockpool/errors_test.go | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

(limited to 'blockpool/errors_test.go')

diff --git a/blockpool/errors_test.go b/blockpool/errors_test.go
index 65a161233..5188930f0 100644
--- a/blockpool/errors_test.go
+++ b/blockpool/errors_test.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/blockpool/test"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/pow"
 )
@@ -45,7 +46,7 @@ func TestVerifyPoW(t *testing.T) {
 	first := false
 	blockPoolTester.blockPool.verifyPoW = func(b pow.Block) bool {
 		bb, _ := b.(*types.Block)
-		indexes := blockPoolTester.hashPool.HashesToIndexes([][]byte{bb.Hash()})
+		indexes := blockPoolTester.hashPool.HashesToIndexes([]common.Hash{bb.Hash()})
 		if indexes[0] == 2 && !first {
 			first = true
 			return false
@@ -122,3 +123,33 @@ func TestErrInsufficientChainInfo(t *testing.T) {
 		t.Errorf("expected %v error, got %v", ErrInsufficientChainInfo, peer1.peerErrors)
 	}
 }
+
+func TestPeerSuspension(t *testing.T) {
+	test.LogInit()
+	_, blockPool, blockPoolTester := newTestBlockPool(t)
+	blockPool.Config.PeerSuspensionInterval = 100 * time.Millisecond
+
+	blockPool.Start()
+
+	peer1 := blockPoolTester.newPeer("peer1", 1, 3)
+	peer1.AddPeer()
+	blockPool.peers.peerError("peer1", 0, "")
+	bestpeer, _ := blockPool.peers.getPeer("peer1")
+	if bestpeer != nil {
+		t.Errorf("peer1 not removed on error")
+	}
+	peer1.AddPeer()
+	bestpeer, _ = blockPool.peers.getPeer("peer1")
+	if bestpeer != nil {
+		t.Errorf("peer1 not removed on reconnect")
+	}
+	time.Sleep(100 * time.Millisecond)
+	peer1.AddPeer()
+	bestpeer, _ = blockPool.peers.getPeer("peer1")
+	if bestpeer == nil {
+		t.Errorf("peer1 not connected after PeerSuspensionInterval")
+	}
+	// blockPool.Wait(waitTimeout)
+	blockPool.Stop()
+
+}
-- 
cgit v1.2.3


From 137a9c9365dd9ec76d4a4aab7475d716457d00ae Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Thu, 19 Mar 2015 23:00:19 +0000
Subject: check and penalise td misreporting - add ErrIncorrectTD - checkTD
 called after insertChain successful - fix tests, use blockPoolTester.tds to
 map block index to TD

---
 blockpool/errors_test.go | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'blockpool/errors_test.go')

diff --git a/blockpool/errors_test.go b/blockpool/errors_test.go
index 5188930f0..350d6daef 100644
--- a/blockpool/errors_test.go
+++ b/blockpool/errors_test.go
@@ -93,7 +93,6 @@ func TestUnrequestedBlock(t *testing.T) {
 	peer1.AddPeer()
 	peer1.sendBlocks(1, 2)
 
-	// blockPool.Wait(waitTimeout)
 	blockPool.Stop()
 	if len(peer1.peerErrors) == 1 {
 		if peer1.peerErrors[0] != ErrUnrequestedBlock {
@@ -124,6 +123,33 @@ func TestErrInsufficientChainInfo(t *testing.T) {
 	}
 }
 
+func TestIncorrectTD(t *testing.T) {
+	test.LogInit()
+	_, blockPool, blockPoolTester := newTestBlockPool(t)
+	blockPoolTester.blockChain[0] = nil
+	blockPoolTester.initRefBlockChain(3)
+
+	blockPool.Start()
+
+	peer1 := blockPoolTester.newPeer("peer1", 1, 3)
+	peer1.AddPeer()
+	go peer1.serveBlocks(2, 3)
+	go peer1.serveBlockHashes(3, 2, 1, 0)
+	peer1.serveBlocks(0, 1, 2)
+
+	blockPool.Wait(waitTimeout)
+	blockPool.Stop()
+	blockPoolTester.refBlockChain[3] = []int{}
+	blockPoolTester.checkBlockChain(blockPoolTester.refBlockChain)
+	if len(peer1.peerErrors) == 1 {
+		if peer1.peerErrors[0] != ErrIncorrectTD {
+			t.Errorf("wrong error, got %v, expected %v", peer1.peerErrors[0], ErrIncorrectTD)
+		}
+	} else {
+		t.Errorf("expected %v error, got %v", ErrIncorrectTD, peer1.peerErrors)
+	}
+}
+
 func TestPeerSuspension(t *testing.T) {
 	test.LogInit()
 	_, blockPool, blockPoolTester := newTestBlockPool(t)
-- 
cgit v1.2.3