Merge pull request #8584 from yyforyongyu/fix-unit-race

guggero · web-flow · commit d3e5b2f79952 · 2024-03-26T02:37:53.000-06:00
chainntnfs: fix race in `TestInterfaces`
diff --git a/chainntnfs/test/test_interface.go b/chainntnfs/test/test_interface.go
@@ -1893,7 +1893,6 @@ func TestInterfaces(t *testing.T, targetBackEnd string) {
 	// play around with.
 	miner := unittest.NewMiner(t, unittest.NetParams, nil, true, 25)
 
-	rpcConfig := miner.RPCConfig()
 	p2pAddr := miner.P2PAddress()
 
 	log.Printf("Running %v ChainNotifier interface tests",
@@ -1953,10 +1952,10 @@ func TestInterfaces(t *testing.T, targetBackEnd string) {
 			}
 
 		case "btcd":
-			configCopy := rpcConfig
+			rpcConfig := miner.RPCConfig()
 			newNotifier = func() (chainntnfs.TestChainNotifier, error) {
 				return btcdnotify.New(
-					&configCopy, unittest.NetParams,
+					&rpcConfig, unittest.NetParams,
 					hintCache, hintCache, blockCache,
 				)
 			}

Original file line number	Diff line number	Diff line change
`@@ -1893,7 +1893,6 @@ func TestInterfaces(t *testing.T, targetBackEnd string) {`
`1893`	`1893`	`// play around with.`
`1894`	`1894`	`miner := unittest.NewMiner(t, unittest.NetParams, nil, true, 25)`
`1895`	`1895`
`1896`		`- rpcConfig := miner.RPCConfig()`
`1897`	`1896`	`p2pAddr := miner.P2PAddress()`
`1898`	`1897`
`1899`	`1898`	`log.Printf("Running %v ChainNotifier interface tests",`
`@@ -1953,10 +1952,10 @@ func TestInterfaces(t *testing.T, targetBackEnd string) {`
`1953`	`1952`	`}`
`1954`	`1953`
`1955`	`1954`	`case "btcd":`
`1956`		`- configCopy := rpcConfig`
	`1955`	`+ rpcConfig := miner.RPCConfig()`
`1957`	`1956`	`newNotifier = func() (chainntnfs.TestChainNotifier, error) {`
`1958`	`1957`	`return btcdnotify.New(`
`1959`		`- &configCopy, unittest.NetParams,`
	`1958`	`+ &rpcConfig, unittest.NetParams,`
`1960`	`1959`	`hintCache, hintCache, blockCache,`
`1961`	`1960`	`)`
`1962`	`1961`	`}`