akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2088 from wpaulino/lower-mempool-spend-check-timeout

Browse Source 
chainntnfs/interface_test: lower mempool spend check timeout
This commit is contained in:
Wilmer Paulino 2019-09-04 12:08:06 -07:00 committed by GitHub
commit d1a4fe7e2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chainntnfs/interface_test.go
View File

@ -320,11 +320,7 @@ func testSpendNotification(miner *rpctest.Harness,
// Make sure notifications are not yet sent. We launch a go routine for // Make sure notifications are not yet sent. We launch a go routine for
// all the spend clients, such that we can wait for them all in // all the spend clients, such that we can wait for them all in
// parallel. // parallel.
// mempoolSpendTimeout := 2 * chainntnfs.TrickleInterval
// Since bitcoind is at times very slow at notifying about txs in the
// mempool, we use a quite large timeout of 10 seconds.
// TODO(halseth): change this when mempool spends are removed.
mempoolSpendTimeout := 10 * time.Second
mempoolSpends := make(chan *chainntnfs.SpendDetail, numClients) mempoolSpends := make(chan *chainntnfs.SpendDetail, numClients)
for _, c := range spendClients { for _, c := range spendClients {
go func(client *chainntnfs.SpendEvent) { go func(client *chainntnfs.SpendEvent) {

8
chainntnfs/test_utils.go
View File

@ -27,10 +27,10 @@ import (
) )
var ( var (
// trickleInterval is the interval at which the miner should trickle // TrickleInterval is the interval at which the miner should trickle
// transactions to its peers. We'll set it small to ensure the miner // transactions to its peers. We'll set it small to ensure the miner
// propagates transactions quickly in the tests. // propagates transactions quickly in the tests.
trickleInterval = 10 * time.Millisecond TrickleInterval = 10 * time.Millisecond
) )
var ( var (
@ -78,7 +78,7 @@ func GetTestTxidAndScript(h *rpctest.Harness) (*chainhash.Hash, []byte, error) {
// WaitForMempoolTx waits for the txid to be seen in the miner's mempool. // WaitForMempoolTx waits for the txid to be seen in the miner's mempool.
func WaitForMempoolTx(miner *rpctest.Harness, txid *chainhash.Hash) error { func WaitForMempoolTx(miner *rpctest.Harness, txid *chainhash.Hash) error {
timeout := time.After(10 * time.Second) timeout := time.After(10 * time.Second)
trickle := time.After(2 * trickleInterval) trickle := time.After(2 * TrickleInterval)
for { for {
// Check for the harness' knowledge of the txid. // Check for the harness' knowledge of the txid.
tx, err := miner.Node.GetRawTransaction(txid) tx, err := miner.Node.GetRawTransaction(txid)
@ -174,7 +174,7 @@ func NewMiner(t *testing.T, extraArgs []string, createChain bool,
t.Helper() t.Helper()
// Add the trickle interval argument to the extra args. // Add the trickle interval argument to the extra args.
trickle := fmt.Sprintf("--trickleinterval=%v", trickleInterval) trickle := fmt.Sprintf("--trickleinterval=%v", TrickleInterval)
extraArgs = append(extraArgs, trickle) extraArgs = append(extraArgs, trickle)
node, err := rpctest.New(NetParams, nil, extraArgs) node, err := rpctest.New(NetParams, nil, extraArgs)