fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-07-31 20:21:56 +00:00
Code Issues Projects Releases Wiki Activity

Blockpool better timeouts, download rate observation, quicker switching to consensus; Id -> ID (sorry, this doesn't belong here)

Browse Source
This commit is contained in:
Jae Kwon
2015-08-18 10:51:55 -07:00
parent 65ecf4b3a2
commit 625f23af13
24 changed files with 478 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
blockchain/pool_test.go
View File

@@ -17,9 +17,9 @@ type testPeer struct {
func makePeers(numPeers int, minHeight, maxHeight int) map[string]testPeer {
peers := make(map[string]testPeer, numPeers)
for i := 0; i < numPeers; i++ {
peerId := RandStr(12)
peerID := RandStr(12)
height := minHeight + rand.Intn(maxHeight-minHeight)
peers[peerId] = testPeer{peerId, height}
peers[peerID] = testPeer{peerID, height}
}
return peers
}
@@ -57,8 +57,8 @@ func TestBasic(t *testing.T) {
// Pull from channels
for {
select {
case peerId := <-timeoutsCh:
t.Errorf("timeout: %v", peerId)
case peerID := <-timeoutsCh:
t.Errorf("timeout: %v", peerID)
case request := <-requestsCh:
log.Info("TEST: Pulled new BlockRequest", "request", request)
if request.Height == 300 {
@@ -67,8 +67,8 @@ func TestBasic(t *testing.T) {
// Request desired, pretend like we got the block immediately.
go func() {
block := &types.Block{Header: &types.Header{Height: request.Height}}
pool.AddBlock(block, request.PeerId)
log.Info("TEST: Added block", "block", request.Height, "peer", request.PeerId)
pool.AddBlock(request.PeerID, block, 123)
log.Info("TEST: Added block", "block", request.Height, "peer", request.PeerID)
}()
}
}
@@ -111,9 +111,9 @@ func TestTimeout(t *testing.T) {
timedOut := map[string]struct{}{}
for {
select {
case peerId := <-timeoutsCh:
log.Info("Timeout", "peerId", peerId)
if _, ok := timedOut[peerId]; !ok {
case peerID := <-timeoutsCh:
log.Info("Timeout", "peerID", peerID)
if _, ok := timedOut[peerID]; !ok {
counter++
if counter == len(peers) {
return // Done!