From 50661f0e683b4975894a0e8fe16024724adef72d Mon Sep 17 00:00:00 2001 From: zelig 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/test/hash_pool.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'blockpool/test') diff --git a/blockpool/test/hash_pool.go b/blockpool/test/hash_pool.go index 4e0332d7d..eea135af1 100644 --- a/blockpool/test/hash_pool.go +++ b/blockpool/test/hash_pool.go @@ -3,6 +3,7 @@ package test import ( "sync" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" ) @@ -13,9 +14,9 @@ func NewHashPool() *TestHashPool { return &TestHashPool{intToHash: make(intToHash), hashToInt: make(hashToInt)} } -type intToHash map[int][]byte +type intToHash map[int]common.Hash -type hashToInt map[string]int +type hashToInt map[common.Hash]int // hashPool is a test helper, that allows random hashes to be referred to by integers type TestHashPool struct { @@ -24,11 +25,11 @@ type TestHashPool struct { lock sync.Mutex } -func newHash(i int) []byte { - return crypto.Sha3([]byte(string(i))) +func newHash(i int) common.Hash { + return common.BytesToHash(crypto.Sha3([]byte(string(i)))) } -func (self *TestHashPool) IndexesToHashes(indexes []int) (hashes [][]byte) { +func (self *TestHashPool) IndexesToHashes(indexes []int) (hashes []common.Hash) { self.lock.Lock() defer self.lock.Unlock() for _, i := range indexes { @@ -36,18 +37,18 @@ func (self *TestHashPool) IndexesToHashes(indexes []int) (hashes [][]byte) { if !found { hash = newHash(i) self.intToHash[i] = hash - self.hashToInt[string(hash)] = i + self.hashToInt[hash] = i } hashes = append(hashes, hash) } return } -func (self *TestHashPool) HashesToIndexes(hashes [][]byte) (indexes []int) { +func (self *TestHashPool) HashesToIndexes(hashes []common.Hash) (indexes []int) { self.lock.Lock() defer self.lock.Unlock() for _, hash := range hashes { - i, found := self.hashToInt[string(hash)] + i, found := self.hashToInt[hash] if !found { i = -1 } -- cgit v1.2.3 From 8767179d7439d8a28086ae6162e2234ed9e16d64 Mon Sep 17 00:00:00 2001 From: zelig Date: Thu, 19 Mar 2015 23:03:50 +0000 Subject: reduce logging output --- blockpool/test/logger.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'blockpool/test') diff --git a/blockpool/test/logger.go b/blockpool/test/logger.go index 8b776e0b5..5d26151c1 100644 --- a/blockpool/test/logger.go +++ b/blockpool/test/logger.go @@ -19,7 +19,7 @@ func TestFunc(t *testing.T) { */ func LogInit() { once.Do(func() { - var logsys = logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(logger.DebugDetailLevel)) + var logsys = logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(logger.WarnLevel)) logger.AddLogSystem(logsys) }) } -- cgit v1.2.3 From a578db5dae0ae82ac8e06be8a29c48a7db22ebe0 Mon Sep 17 00:00:00 2001 From: zelig Date: Thu, 19 Mar 2015 23:14:08 +0000 Subject: improve documentation and move one test --- blockpool/test/hash_pool.go | 15 ++++++--------- blockpool/test/logger.go | 2 ++ blockpool/test/util.go | 2 ++ 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'blockpool/test') diff --git a/blockpool/test/hash_pool.go b/blockpool/test/hash_pool.go index eea135af1..df3c750f9 100644 --- a/blockpool/test/hash_pool.go +++ b/blockpool/test/hash_pool.go @@ -7,8 +7,12 @@ import ( "github.com/ethereum/go-ethereum/crypto" ) -// test helpers -// TODO: move into common test helper package (see p2p/crypto etc.) +// hashPool is a test helper, that allows random hashes to be referred to by integers +type TestHashPool struct { + intToHash + hashToInt + lock sync.Mutex +} func NewHashPool() *TestHashPool { return &TestHashPool{intToHash: make(intToHash), hashToInt: make(hashToInt)} @@ -18,13 +22,6 @@ type intToHash map[int]common.Hash type hashToInt map[common.Hash]int -// hashPool is a test helper, that allows random hashes to be referred to by integers -type TestHashPool struct { - intToHash - hashToInt - lock sync.Mutex -} - func newHash(i int) common.Hash { return common.BytesToHash(crypto.Sha3([]byte(string(i)))) } diff --git a/blockpool/test/logger.go b/blockpool/test/logger.go index 5d26151c1..bcb4d4cb3 100644 --- a/blockpool/test/logger.go +++ b/blockpool/test/logger.go @@ -9,6 +9,8 @@ import ( "github.com/ethereum/go-ethereum/logger" ) +// logging in tests + var once sync.Once /* usage: diff --git a/blockpool/test/util.go b/blockpool/test/util.go index e183bf1d1..0349493c3 100644 --- a/blockpool/test/util.go +++ b/blockpool/test/util.go @@ -6,6 +6,8 @@ import ( "time" ) +// miscellaneous test helpers + func CheckInt(name string, got int, expected int, t *testing.T) (err error) { if got != expected { t.Errorf("status for %v incorrect. expected %v, got %v", name, expected, got) -- cgit v1.2.3