@@ -16,7 +16,7 @@ import (
1616 "github.com/decred/dcrd/chaincfg/chainhash"
1717 "github.com/decred/dcrd/dcrutil/v4"
1818 "github.com/decred/dcrd/rpcclient/v8"
19- "github.com/decred/dcrd/rpctest "
19+ rpctest "github.com/decred/dcrtest/dcrdtest "
2020
2121 "github.com/decred/dcrd/wire"
2222 "github.com/decred/dcrlnd/chainntnfs"
@@ -1174,7 +1174,9 @@ func testReorgConf(miner *rpctest.Harness, vw *rpctest.VotingWallet,
11741174
11751175 // Reorganize transaction out of the chain by generating a longer fork
11761176 // from the other miner. The transaction is not included in this fork.
1177- testutils .AdjustedSimnetMiner (miner2 .Node , 2 )
1177+ if _ , err := rpctest .AdjustedSimnetMiner (ctxb , miner2 .Node , 2 ); err != nil {
1178+ t .Fatalf ("unable to generate longer fork: %v" , err )
1179+ }
11781180
11791181 // Reconnect nodes to reach consensus on the longest chain. miner2's chain
11801182 // should win and become active on miner1.
@@ -1339,7 +1341,7 @@ func testReorgSpend(miner *rpctest.Harness, vw *rpctest.VotingWallet,
13391341
13401342 // Now, with the other miner, we'll generate one more block than the
13411343 // other miner and connect them to cause a reorg.
1342- if _ , err := testutils .AdjustedSimnetMiner (miner2 .Node , numBlocks + 1 ); err != nil {
1344+ if _ , err := rpctest .AdjustedSimnetMiner (ctxb , miner2 .Node , numBlocks + 1 ); err != nil {
13431345 t .Fatalf ("unable to generate blocks: %v" , err )
13441346 }
13451347 if err := rpctest .ConnectNode (ctxb , miner , miner2 ); err != nil {
@@ -1658,7 +1660,7 @@ func testCatchUpOnMissedBlocksWithReorg(miner1 *rpctest.Harness, vw *rpctest.Vot
16581660
16591661 // We generate an extra block on miner 2's chain to ensure it is the
16601662 // longer chain.
1661- _ , err = testutils .AdjustedSimnetMiner (miner2 .Node , numBlocks + 1 )
1663+ _ , err = rpctest .AdjustedSimnetMiner (ctxb , miner2 .Node , numBlocks + 1 )
16621664 if err != nil {
16631665 t .Fatalf ("unable to generate single block: %v" , err )
16641666 }
@@ -1731,7 +1733,7 @@ func testCatchUpOnMissedBlocksWithReorg(miner1 *rpctest.Harness, vw *rpctest.Vot
17311733
17321734 // Generate a single block, which should trigger the notifier to rewind
17331735 // to the common ancestor and dispatch notifications from there.
1734- _ , err = testutils .AdjustedSimnetMiner (miner2 .Node , 1 )
1736+ _ , err = rpctest .AdjustedSimnetMiner (ctxb , miner2 .Node , 1 )
17351737 if err != nil {
17361738 t .Fatalf ("unable to generate single block: %v" , err )
17371739 }
@@ -1926,7 +1928,7 @@ func TestInterfaces(t *testing.T) {
19261928
19271929 // Generate enough blocks so that the network harness can have
19281930 // funds to send to the voting wallet, Alice and Bob.
1929- _ , err = testutils .AdjustedSimnetMiner (miner .Node , 64 )
1931+ _ , err = rpctest .AdjustedSimnetMiner (ctxb , miner .Node , 64 )
19301932 if err != nil {
19311933 t .Fatalf ("unable to init chain: %v" , err )
19321934 }
@@ -1940,7 +1942,7 @@ func TestInterfaces(t *testing.T) {
19401942 // are generated as fast as possible without triggering PoW difficulty
19411943 // increases.
19421944 vw .SetMiner (func (ctx context.Context , nb uint32 ) ([]* chainhash.Hash , error ) {
1943- return testutils .AdjustedSimnetMiner (miner .Node , nb )
1945+ return rpctest .AdjustedSimnetMiner (ctxb , miner .Node , nb )
19441946 })
19451947
19461948 vwCtx , vwCancel := context .WithCancel (ctxb )
0 commit comments