integration/rpctest: remove redundant boolean from harness setup

allocz · allocz · commit 14d655f87f9e · 2026-07-07T19:59:42.000Z
Previously the [Harness.SetUp] procedure was taking a boolean to
generate a test chain and a integer for the required number of mature
outputs, but internally, the test chain was being generated only if the
number of mature outputs was different than zero and the boolean was
true, this means that we can remove the boolean and pass zero when we
don't want to create the test chain.

After the change, all the tests still passing.
diff --git a/integration/bip0009_test.go b/integration/bip0009_test.go
@@ -136,7 +136,7 @@ func testBIP0009(t *testing.T, forkKey string, deploymentID uint32) {
 	if err != nil {
 		t.Fatalf("unable to create primary harness: %v", err)
 	}
-	if err := r.SetUp(false, 0); err != nil {
+	if err := r.SetUp(0); err != nil {
 		t.Fatalf("unable to setup test chain: %v", err)
 	}
 	defer r.TearDown()
@@ -389,7 +389,7 @@ func TestBIP0009Mining(t *testing.T) {
 	if err != nil {
 		t.Fatalf("unable to create primary harness: %v", err)
 	}
-	if err := r.SetUp(true, 0); err != nil {
+	if err := r.SetUp(0); err != nil {
 		t.Fatalf("unable to setup test chain: %v", err)
 	}
 	defer r.TearDown()
diff --git a/integration/chain_test.go b/integration/chain_test.go
@@ -30,7 +30,7 @@ func TestGetTxSpendingPrevOut(t *testing.T) {
 	require.NoError(t, err)
 
 	// Setup the node.
-	require.NoError(t, r.SetUp(true, 100))
+	require.NoError(t, r.SetUp(100))
 	t.Cleanup(func() {
 		require.NoError(t, r.TearDown())
 	})
diff --git a/integration/csv_fork_test.go b/integration/csv_fork_test.go
@@ -115,7 +115,7 @@ func TestBIP0113Activation(t *testing.T) {
 	if err != nil {
 		t.Fatal("unable to create primary harness: ", err)
 	}
-	if err := r.SetUp(true, 1); err != nil {
+	if err := r.SetUp(1); err != nil {
 		t.Fatalf("unable to setup test chain: %v", err)
 	}
 	defer r.TearDown()
@@ -412,7 +412,7 @@ func TestBIP0068AndBIP0112Activation(t *testing.T) {
 	if err != nil {
 		t.Fatal("unable to create primary harness: ", err)
 	}
-	if err := r.SetUp(true, 1); err != nil {
+	if err := r.SetUp(1); err != nil {
 		t.Fatalf("unable to setup test chain: %v", err)
 	}
 	defer r.TearDown()
diff --git a/integration/debugstream_test.go b/integration/debugstream_test.go
@@ -36,7 +36,7 @@ func TestDebugStream(t *testing.T) {
 		DebugStreamHandler: debHandler,
 	})
 	require.NoError(t, err)
-	h.SetUp(false, 0)
+	h.SetUp(0)
 
 	err = h.TearDown()
 	require.NoError(t, err)
diff --git a/integration/getchaintips_test.go b/integration/getchaintips_test.go
@@ -151,7 +151,7 @@ func TestGetChainTips(t *testing.T) {
 	if err != nil {
 		t.Fatal("TestGetChainTips fail. Unable to create primary harness: ", err)
 	}
-	if err := r.SetUp(true, 0); err != nil {
+	if err := r.SetUp(0); err != nil {
 		t.Fatalf("TestGetChainTips fail. Unable to setup test chain: %v", err)
 	}
 	defer r.TearDown()
diff --git a/integration/invalidate_reconsider_block_test.go b/integration/invalidate_reconsider_block_test.go
@@ -16,7 +16,7 @@ func TestInvalidateAndReconsiderBlock(t *testing.T) {
 		t.Fatalf("TestInvalidateAndReconsiderBlock fail."+
 			"Unable to create primary harness: %v", err)
 	}
-	if err := r.SetUp(true, 0); err != nil {
+	if err := r.SetUp(0); err != nil {
 		t.Fatalf("TestInvalidateAndReconsiderBlock fail. "+
 			"Unable to setup test chain: %v", err)
 	}
diff --git a/integration/p2a_test.go b/integration/p2a_test.go
@@ -41,7 +41,7 @@ func TestPayToAnchorSimple(t *testing.T) {
 
 	// Initialize the test harness with mining enabled to confirm
 	// transactions.
-	err = harness.SetUp(true, 25)
+	err = harness.SetUp(25)
 	if err != nil {
 		t.Fatalf("unable to setup test harness: %v", err)
 	}
diff --git a/integration/prune_test.go b/integration/prune_test.go
@@ -23,7 +23,7 @@ func TestPrune(t *testing.T) {
 	r, err := rpctest.New(rpctest.HarnessOpts{ExtraArgs: btcdCfg})
 	require.NoError(t, err)
 
-	if err := r.SetUp(false, 0); err != nil {
+	if err := r.SetUp(0); err != nil {
 		require.NoError(t, err)
 	}
 	t.Cleanup(func() { r.TearDown() })
diff --git a/integration/rawtx_test.go b/integration/rawtx_test.go
@@ -31,7 +31,7 @@ func TestTestMempoolAccept(t *testing.T) {
 	require.NoError(t, err)
 
 	// Setup the node.
-	require.NoError(t, r.SetUp(true, 100))
+	require.NoError(t, r.SetUp(100))
 	t.Cleanup(func() {
 		require.NoError(t, r.TearDown())
 	})
diff --git a/integration/reorg_test.go b/integration/reorg_test.go
@@ -34,12 +34,12 @@ func TestReorgFromForkPoint(t *testing.T) {
 
 	longer, err := rpctest.New()
 	require.NoError(t, err)
-	require.NoError(t, longer.SetUp(false, 0))
+	require.NoError(t, longer.SetUp(0))
 	t.Cleanup(func() { require.NoError(t, longer.TearDown()) })
 
 	shorter, err := rpctest.New()
 	require.NoError(t, err)
-	require.NoError(t, shorter.SetUp(false, 0))
+	require.NoError(t, shorter.SetUp(0))
 	t.Cleanup(func() { require.NoError(t, shorter.TearDown()) })
 
 	// Mine the shared chain on the longer node before connecting so that
diff --git a/integration/rpcserver_test.go b/integration/rpcserver_test.go
@@ -318,7 +318,7 @@ func TestMain(m *testing.M) {
 	// Initialize the primary mining node with a chain of length 125,
 	// providing 25 mature coinbases to allow spending from for testing
 	// purposes.
-	if err := primaryHarness.SetUp(true, 25); err != nil {
+	if err := primaryHarness.SetUp(25); err != nil {
 		fmt.Println("unable to setup test chain: ", err)
 
 		// Even though the harness was not fully setup, it still needs
diff --git a/integration/rpctest/rpc_harness.go b/integration/rpctest/rpc_harness.go
@@ -146,9 +146,9 @@ type HarnessOpts struct {
 	// otherwise we build and use a default executable.
 	CustomExePath string
 
-	// DebugStreamHandler makes the harness to start btcd with the debug
-	// stream enabled, and use the DebugStreamHandler as the handler for
-	// the debug events.
+	// DebugStreamHandler makes the harness start btcd with the debug stream
+	// enabled and use the DebugStreamHandler as the handler of the debug
+	// events coming from btcd.
 	DebugStreamHandler func(debugstream.Event)
 }
 
@@ -294,7 +294,7 @@ func New(opts ...HarnessOpts) (*Harness, error) {
 //
 // NOTE: This method and TearDown should always be called from the same
 // goroutine as they are not concurrent safe.
-func (h *Harness) SetUp(createTestChain bool, numMatureOutputs uint32) error {
+func (h *Harness) SetUp(numMatureOutputs uint32) error {
 	// Start the btcd node itself. This spawns a new process which will be
 	// managed.
 	if err := h.node.start(); err != nil {
@@ -327,7 +327,7 @@ func (h *Harness) SetUp(createTestChain bool, numMatureOutputs uint32) error {
 
 	// Create a test chain with the desired number of mature coinbase
 	// outputs.
-	if createTestChain && numMatureOutputs != 0 {
+	if numMatureOutputs > 0 {
 		coinbaseMaturity := uint32(h.ActiveNet.CoinbaseMaturity)
 		numToGenerate := coinbaseMaturity + numMatureOutputs
 		_, err := h.Client.Generate(numToGenerate)
diff --git a/integration/rpctest/rpc_harness_test.go b/integration/rpctest/rpc_harness_test.go
@@ -109,7 +109,7 @@ func testConnectNode(r *Harness, t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := harness.SetUp(false, 0); err != nil {
+	if err := harness.SetUp(0); err != nil {
 		t.Fatalf("unable to complete rpctest setup: %v", err)
 	}
 	defer harness.TearDown()
@@ -185,7 +185,7 @@ func testJoinMempools(r *Harness, t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := harness.SetUp(false, 0); err != nil {
+	if err := harness.SetUp(0); err != nil {
 		t.Fatalf("unable to complete rpctest setup: %v", err)
 	}
 	defer harness.TearDown()
@@ -285,7 +285,7 @@ func testJoinBlocks(r *Harness, t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := harness.SetUp(false, 0); err != nil {
+	if err := harness.SetUp(0); err != nil {
 		t.Fatalf("unable to complete rpctest setup: %v", err)
 	}
 	defer harness.TearDown()
@@ -473,7 +473,7 @@ func testMemWalletReorg(r *Harness, t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := harness.SetUp(true, 5); err != nil {
+	if err := harness.SetUp(5); err != nil {
 		t.Fatalf("unable to complete rpctest setup: %v", err)
 	}
 	defer harness.TearDown()
@@ -551,7 +551,7 @@ func testSkipCleanup(_ *Harness, t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := h.SetUp(true, 1); err != nil {
+	if err := h.SetUp(1); err != nil {
 		t.Fatal(err)
 	}
 	defer h.TearDown()
@@ -569,7 +569,7 @@ func testSkipCleanup(_ *Harness, t *testing.T) {
 
 			t.Fatal(err)
 		}
-		if err := h.SetUp(false, 0); err != nil {
+		if err := h.SetUp(0); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -592,7 +592,7 @@ func testTearDownReturnsErrorWhenExitCodeIsNotZero(_ *Harness, t *testing.T) {
 	// Make sure we fail quick.
 	h.ConnectionRetryTimeout = time.Millisecond * 100
 	h.MaxConnRetries = 1
-	if err := h.SetUp(false, 0); err == nil {
+	if err := h.SetUp(0); err == nil {
 		t.Fatal(err)
 	}
 
@@ -633,7 +633,7 @@ func TestMain(m *testing.M) {
 	// Initialize the main mining node with a chain of length 125,
 	// providing 25 mature coinbases to allow spending from for testing
 	// purposes.
-	if err = mainHarness.SetUp(true, numMatureOutputs); err != nil {
+	if err = mainHarness.SetUp(numMatureOutputs); err != nil {
 		fmt.Println("unable to setup test chain: ", err)
 
 		// Even though the harness was not fully setup, it still needs
diff --git a/integration/sync_race_test.go b/integration/sync_race_test.go
@@ -100,7 +100,7 @@ func fakePeerConn(nodeAddr string) error {
 func TestSyncManagerRaceCorruption(t *testing.T) {
 	stressedHarness, err := rpctest.New()
 	require.NoError(t, err)
-	require.NoError(t, stressedHarness.SetUp(true, 0))
+	require.NoError(t, stressedHarness.SetUp(0))
 	t.Cleanup(func() {
 		require.NoError(t, stressedHarness.TearDown())
 	})
@@ -129,7 +129,7 @@ func TestSyncManagerRaceCorruption(t *testing.T) {
 	// peers), it will not sync from the new one.
 	newHarness, err := rpctest.New()
 	require.NoError(t, err)
-	require.NoError(t, newHarness.SetUp(true, 0))
+	require.NoError(t, newHarness.SetUp(0))
 	defer func() { _ = newHarness.TearDown() }()
 
 	require.NoError(t, rpctest.ConnectNode(stressedHarness, newHarness),
@@ -205,7 +205,7 @@ func dialAndSendVersion(
 func TestPreVerackDisconnect(t *testing.T) {
 	harness, err := rpctest.New()
 	require.NoError(t, err)
-	require.NoError(t, harness.SetUp(true, 0))
+	require.NoError(t, harness.SetUp(0))
 	t.Cleanup(func() { _ = harness.TearDown() })
 
 	nodeAddr := harness.P2PAddress()
@@ -227,7 +227,7 @@ func TestPreVerackDisconnect(t *testing.T) {
 	// blocks, and confirm the harness syncs them.
 	helper, err := rpctest.New()
 	require.NoError(t, err)
-	require.NoError(t, helper.SetUp(true, 0))
+	require.NoError(t, helper.SetUp(0))
 	defer func() { _ = helper.TearDown() }()
 
 	require.NoError(t, rpctest.ConnectNode(harness, helper))

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func testBIP0009(t *testing.T, forkKey string, deploymentID uint32) {`
`136`	`136`	`if err != nil {`
`137`	`137`	`t.Fatalf("unable to create primary harness: %v", err)`
`138`	`138`	`}`
`139`		`- if err := r.SetUp(false, 0); err != nil {`
	`139`	`+ if err := r.SetUp(0); err != nil {`
`140`	`140`	`t.Fatalf("unable to setup test chain: %v", err)`
`141`	`141`	`}`
`142`	`142`	`defer r.TearDown()`
`@@ -389,7 +389,7 @@ func TestBIP0009Mining(t *testing.T) {`
`389`	`389`	`if err != nil {`
`390`	`390`	`t.Fatalf("unable to create primary harness: %v", err)`
`391`	`391`	`}`
`392`		`- if err := r.SetUp(true, 0); err != nil {`
	`392`	`+ if err := r.SetUp(0); err != nil {`
`393`	`393`	`t.Fatalf("unable to setup test chain: %v", err)`
`394`	`394`	`}`
`395`	`395`	`defer r.TearDown()`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ func TestBIP0113Activation(t *testing.T) {`
`115`	`115`	`if err != nil {`
`116`	`116`	`t.Fatal("unable to create primary harness: ", err)`
`117`	`117`	`}`
`118`		`- if err := r.SetUp(true, 1); err != nil {`
	`118`	`+ if err := r.SetUp(1); err != nil {`
`119`	`119`	`t.Fatalf("unable to setup test chain: %v", err)`
`120`	`120`	`}`
`121`	`121`	`defer r.TearDown()`
`@@ -412,7 +412,7 @@ func TestBIP0068AndBIP0112Activation(t *testing.T) {`
`412`	`412`	`if err != nil {`
`413`	`413`	`t.Fatal("unable to create primary harness: ", err)`
`414`	`414`	`}`
`415`		`- if err := r.SetUp(true, 1); err != nil {`
	`415`	`+ if err := r.SetUp(1); err != nil {`
`416`	`416`	`t.Fatalf("unable to setup test chain: %v", err)`
`417`	`417`	`}`
`418`	`418`	`defer r.TearDown()`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ func TestGetChainTips(t *testing.T) {`
`151`	`151`	`if err != nil {`
`152`	`152`	`t.Fatal("TestGetChainTips fail. Unable to create primary harness: ", err)`
`153`	`153`	`}`
`154`		`- if err := r.SetUp(true, 0); err != nil {`
	`154`	`+ if err := r.SetUp(0); err != nil {`
`155`	`155`	`t.Fatalf("TestGetChainTips fail. Unable to setup test chain: %v", err)`
`156`	`156`	`}`
`157`	`157`	`defer r.TearDown()`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ func TestInvalidateAndReconsiderBlock(t *testing.T) {`
`16`	`16`	`t.Fatalf("TestInvalidateAndReconsiderBlock fail."+`
`17`	`17`	`"Unable to create primary harness: %v", err)`
`18`	`18`	`}`
`19`		`- if err := r.SetUp(true, 0); err != nil {`
	`19`	`+ if err := r.SetUp(0); err != nil {`
`20`	`20`	`t.Fatalf("TestInvalidateAndReconsiderBlock fail. "+`
`21`	`21`	`"Unable to setup test chain: %v", err)`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func TestPayToAnchorSimple(t *testing.T) {`
`41`	`41`
`42`	`42`	`// Initialize the test harness with mining enabled to confirm`
`43`	`43`	`// transactions.`
`44`		`- err = harness.SetUp(true, 25)`
	`44`	`+ err = harness.SetUp(25)`
`45`	`45`	`if err != nil {`
`46`	`46`	`t.Fatalf("unable to setup test harness: %v", err)`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func TestPrune(t *testing.T) {`
`23`	`23`	`r, err := rpctest.New(rpctest.HarnessOpts{ExtraArgs: btcdCfg})`
`24`	`24`	`require.NoError(t, err)`
`25`	`25`
`26`		`- if err := r.SetUp(false, 0); err != nil {`
	`26`	`+ if err := r.SetUp(0); err != nil {`
`27`	`27`	`require.NoError(t, err)`
`28`	`28`	`}`
`29`	`29`	`t.Cleanup(func() { r.TearDown() })`