cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

eth/downloader: fixed tests

Browse Source
This commit is contained in:
obscuren 2015-04-24 15:56:18 +02:00
parent d84c2202e7
commit a9e4b96573
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eth/downloader/downloader_test.go
View File

@ -65,10 +65,6 @@ func (dl *downloadTester) hasBlock(hash common.Hash) bool {
func (dl *downloadTester) insertChain(blocks types.Blocks) error { func (dl *downloadTester) insertChain(blocks types.Blocks) error {
dl.insertedBlocks += len(blocks) dl.insertedBlocks += len(blocks)
if len(dl.blocks)-1 <= dl.insertedBlocks {
dl.done <- true
}
return nil return nil
} }
@ -93,14 +89,14 @@ func (dl *downloadTester) getBlocks(id string) func([]common.Hash) error {
func (dl *downloadTester) newPeer(id string, td *big.Int, hash common.Hash) { func (dl *downloadTester) newPeer(id string, td *big.Int, hash common.Hash) {
dl.pcount++ dl.pcount++
dl.downloader.RegisterPeer(id, td, hash, dl.getHashes, dl.getBlocks(id)) dl.downloader.RegisterPeer(id, hash, dl.getHashes, dl.getBlocks(id))
} }
func (dl *downloadTester) badBlocksPeer(id string, td *big.Int, hash common.Hash) { func (dl *downloadTester) badBlocksPeer(id string, td *big.Int, hash common.Hash) {
dl.pcount++ dl.pcount++
// This bad peer never returns any blocks // This bad peer never returns any blocks
dl.downloader.RegisterPeer(id, td, hash, dl.getHashes, func([]common.Hash) error { dl.downloader.RegisterPeer(id, hash, dl.getHashes, func([]common.Hash) error {
return nil return nil
}) })
} }
@ -122,13 +118,13 @@ func TestDownload(t *testing.T) {
tester.badBlocksPeer("peer3", big.NewInt(0), common.Hash{}) tester.badBlocksPeer("peer3", big.NewInt(0), common.Hash{})
tester.badBlocksPeer("peer4", big.NewInt(0), common.Hash{}) tester.badBlocksPeer("peer4", big.NewInt(0), common.Hash{})
blox, err := tester.downloader.Synchronise("peer1", hashes[0]) err := tester.downloader.Synchronise("peer1", hashes[0])
if err != nil { if err != nil {
t.Error("download error", err) t.Error("download error", err)
} }
if len(blox) != targetBlocks { if tester.insertedBlocks != targetBlocks {
t.Error("expected", targetBlocks, "have", len(blox)) t.Error("expected", targetBlocks, "have", tester.insertedBlocks)
} }
} }
@ -147,12 +143,12 @@ func TestMissing(t *testing.T) {
hashes = append(extraHashes, hashes[:len(hashes)-1]...) hashes = append(extraHashes, hashes[:len(hashes)-1]...)
tester.newPeer("peer2", big.NewInt(0), common.Hash{}) tester.newPeer("peer2", big.NewInt(0), common.Hash{})
blox, err := tester.downloader.Synchronise("peer1", hashes[0]) err := tester.downloader.Synchronise("peer1", hashes[0])
if err != nil { if err != nil {
t.Error("download error", err) t.Error("download error", err)
} }
if len(blox) != targetBlocks { if tester.insertedBlocks != targetBlocks {
t.Error("expected", targetBlocks, "have", len(blox)) t.Error("expected", targetBlocks, "have", tester.insertedBlocks)
} }
} }