BTCPrivate
/
lnd
mirror of https://github.com/BTCPrivate/lnd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

routing/chainview: report line # in test failures, bump up timeouts

This commit is contained in:
Olaoluwa Osuntokun 2017-05-21 18:30:55 -07:00
parent 7859f4fcc6
commit 461d84dd75
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
routing/chainview/interface_test.go
View File

@ -84,17 +84,19 @@ func craftSpendTransaction(outpoint wire.OutPoint, payScript []byte) (*wire.MsgT
func assertFilteredBlock(t *testing.T, fb *FilteredBlock, expectedHeight int32, func assertFilteredBlock(t *testing.T, fb *FilteredBlock, expectedHeight int32,
expectedHash *chainhash.Hash, txns []*chainhash.Hash) { expectedHash *chainhash.Hash, txns []*chainhash.Hash) {
_, _, line, _ := runtime.Caller(1)
if fb.Height != uint32(expectedHeight) { if fb.Height != uint32(expectedHeight) {
t.Fatalf("block height mismatch: expected %v, got %v", t.Fatalf("line %v: block height mismatch: expected %v, got %v",
expectedHeight, fb.Height) line, expectedHeight, fb.Height)
} }
if !bytes.Equal(fb.Hash[:], expectedHash[:]) { if !bytes.Equal(fb.Hash[:], expectedHash[:]) {
t.Fatalf("block hash mismatch: expected %v, got %v", t.Fatalf("line %v: block hash mismatch: expected %v, got %v",
expectedHash, fb.Hash) line, expectedHash, fb.Hash)
} }
if len(fb.Transactions) != len(txns) { if len(fb.Transactions) != len(txns) {
t.Fatalf("expected %v transaction in filtered block, instead "+ t.Fatalf("line %v: expected %v transaction in filtered block, instead "+
"have %v", len(txns), len(fb.Transactions)) "have %v", line, len(txns), len(fb.Transactions))
} }
expectedTxids := make(map[chainhash.Hash]struct{}) expectedTxids := make(map[chainhash.Hash]struct{})
@ -108,7 +110,7 @@ func assertFilteredBlock(t *testing.T, fb *FilteredBlock, expectedHeight int32,
} }
if len(expectedTxids) != 0 { if len(expectedTxids) != 0 {
t.Fatalf("missing txids: %v", expectedTxids) t.Fatalf("line %v: missing txids: %v", line, expectedTxids)
} }
} }
@ -146,7 +148,7 @@ func testFilterBlockNotifications(node *rpctest.Harness,
case filteredBlock := <-blockChan: case filteredBlock := <-blockChan:
assertFilteredBlock(t, filteredBlock, currentHeight, assertFilteredBlock(t, filteredBlock, currentHeight,
newBlockHashes[0], []*chainhash.Hash{}) newBlockHashes[0], []*chainhash.Hash{})
case <-time.After(time.Second * 5): case <-time.After(time.Second * 10):
t.Fatalf("filtered block notification didn't arrive") t.Fatalf("filtered block notification didn't arrive")
} }
@ -272,7 +274,7 @@ func testUpdateFilterBackTrack(node *rpctest.Harness, chainView FilteredChainVie
case filteredBlock := <-blockChan: case filteredBlock := <-blockChan:
assertFilteredBlock(t, filteredBlock, currentHeight, assertFilteredBlock(t, filteredBlock, currentHeight,
initBlockHashes[0], []*chainhash.Hash{}) initBlockHashes[0], []*chainhash.Hash{})
case <-time.After(time.Second * 5): case <-time.After(time.Second * 10):
t.Fatalf("filtered block notification didn't arrive") t.Fatalf("filtered block notification didn't arrive")
} }
@ -304,7 +306,7 @@ func testUpdateFilterBackTrack(node *rpctest.Harness, chainView FilteredChainVie
case filteredBlock := <-blockChan: case filteredBlock := <-blockChan:
assertFilteredBlock(t, filteredBlock, currentHeight+1, assertFilteredBlock(t, filteredBlock, currentHeight+1,
newBlockHashes[0], []*chainhash.Hash{}) newBlockHashes[0], []*chainhash.Hash{})
case <-time.After(time.Second * 5): case <-time.After(time.Second * 10):
t.Fatalf("filtered block notification didn't arrive") t.Fatalf("filtered block notification didn't arrive")
} }
@ -322,7 +324,7 @@ func testUpdateFilterBackTrack(node *rpctest.Harness, chainView FilteredChainVie
case filteredBlock := <-blockChan: case filteredBlock := <-blockChan:
assertFilteredBlock(t, filteredBlock, currentHeight+1, assertFilteredBlock(t, filteredBlock, currentHeight+1,
newBlockHashes[0], []*chainhash.Hash{spendTxid}) newBlockHashes[0], []*chainhash.Hash{spendTxid})
case <-time.After(time.Second * 5): case <-time.After(time.Second * 10):
t.Fatalf("filtered block notification didn't arrive") t.Fatalf("filtered block notification didn't arrive")
} }
} }
@ -358,12 +360,12 @@ func testFilterSingleBlock(node *rpctest.Harness, chainView FilteredChainView,
} }
// We should get an update, however it shouldn't yet contain any // We should get an update, however it shouldn't yet contain any
// filtered transaction as the filter hasn't been update. // filtered transaction as the filter hasn't been updated.
select { select {
case filteredBlock := <-blockChan: case filteredBlock := <-blockChan:
assertFilteredBlock(t, filteredBlock, currentHeight, assertFilteredBlock(t, filteredBlock, currentHeight,
newBlockHashes[0], []*chainhash.Hash{}) newBlockHashes[0], []*chainhash.Hash{})
case <-time.After(time.Second * 5): case <-time.After(time.Second * 10):
t.Fatalf("filtered block notification didn't arrive") t.Fatalf("filtered block notification didn't arrive")
} }
@ -404,7 +406,7 @@ func testFilterSingleBlock(node *rpctest.Harness, chainView FilteredChainView,
case filteredBlock := <-blockChan: case filteredBlock := <-blockChan:
assertFilteredBlock(t, filteredBlock, currentHeight+1, assertFilteredBlock(t, filteredBlock, currentHeight+1,
block.Hash(), []*chainhash.Hash{}) block.Hash(), []*chainhash.Hash{})
case <-time.After(time.Second * 5): case <-time.After(time.Second * 10):
t.Fatalf("filtered block notification didn't arrive") t.Fatalf("filtered block notification didn't arrive")
} }