Merge pull request #890 from starius/unit-race

multi: fix race conditions and run unit tests with -race

Author: starius

.github/workflows/main.yml

@@ -101,7 +101,7 @@ jobs:
           go-version: '~${{ env.GO_VERSION }}'
 
       - name: run unit tests
-        run: make unit
+        run: make unit-race
 
       - name: run unit test with postgres
-        run: make unit-postgres
+        run: make unit-postgres-race

Makefile

@@ -95,14 +95,22 @@ clean:
 # TESTING
 # =======
 
-unit: 
+unit:
 	@$(call print, "Running unit tests.")
 	$(UNIT)
 
+unit-race:
+	@$(call print, "Running unit race tests.")
+	$(UNIT) -race
+
 unit-postgres:
 	@$(call print, "Running unit tests with postgres.")
 	$(UNIT) -tags=test_db_postgres
 
+unit-postgres-race:
+	@$(call print, "Running unit race tests with postgres.")
+	$(UNIT) -race -tags=test_db_postgres
+
 # =========
 # UTILITIES
 # =========

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c // indirect
 	github.com/btcsuite/btcwallet v0.16.10-0.20241127094224-93c858b2ad63
 	github.com/btcsuite/btcwallet/wtxmgr v1.5.4
-	github.com/coreos/bbolt v1.3.3
 	github.com/davecgh/go-spew v1.1.1
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
 	github.com/fortytw2/leaktest v1.3.0
@@ -35,6 +34,7 @@ require (
 	github.com/ory/dockertest/v3 v3.10.0
 	github.com/stretchr/testify v1.9.0
 	github.com/urfave/cli v1.22.9
+	go.etcd.io/bbolt v1.3.11
 	golang.org/x/net v0.36.0
 	google.golang.org/grpc v1.64.1
 	google.golang.org/protobuf v1.34.2
@@ -164,7 +164,6 @@ require (
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
-	go.etcd.io/bbolt v1.3.11 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.12 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
 	go.etcd.io/etcd/client/v2 v2.305.12 // indirect

go.sum

@@ -732,8 +732,6 @@ github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD9
 github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
 github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
 github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
-github.com/coreos/bbolt v1.3.3 h1:n6AiVyVRKQFNb6mJlwESEvvLoDyiTzXX7ORAUlkeBdY=
-github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=

instantout/manager.go

@@ -41,18 +41,17 @@ type Manager struct {
 }
 
 // NewInstantOutManager creates a new instantout manager.
-func NewInstantOutManager(cfg *Config) *Manager {
+func NewInstantOutManager(cfg *Config, height int32) *Manager {
 	return &Manager{
 		cfg:               cfg,
 		activeInstantOuts: make(map[lntypes.Hash]*FSM),
 		blockEpochChan:    make(chan int32),
+		currentHeight:     height,
 	}
 }
 
 // Run runs the instantout manager.
-func (m *Manager) Run(ctx context.Context, initChan chan struct{},
-	height int32) error {
-
+func (m *Manager) Run(ctx context.Context, initChan chan struct{}) error {
 	log.Debugf("Starting instantout manager")
 	defer func() {
 		log.Debugf("Stopping instantout manager")
@@ -62,7 +61,6 @@ func (m *Manager) Run(ctx context.Context, initChan chan struct{},
 	defer cancel()
 
 	m.runCtx = runCtx
-	m.currentHeight = height
 
 	err := m.recoverInstantOuts(runCtx)
 	if err != nil {

instantout/reservation/manager_test.go

@@ -3,6 +3,7 @@ package reservation
 import (
 	"context"
 	"encoding/hex"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -72,13 +73,14 @@ func TestManager(t *testing.T) {
 	require.NoError(t, err)
 
 	// We'll now expect a spend registration.
-	spendReg := <-testContext.mockLnd.RegisterSpendChannel
-	require.Equal(t, spendReg.PkScript, pkScript)
+	var spendReg atomic.Pointer[test.SpendRegistration]
+	spendReg.Store(<-testContext.mockLnd.RegisterSpendChannel)
+	require.Equal(t, spendReg.Load().PkScript, pkScript)
 
 	go func() {
 		// We'll expect a second spend registration.
-		spendReg = <-testContext.mockLnd.RegisterSpendChannel
-		require.Equal(t, spendReg.PkScript, pkScript)
+		spendReg.Store(<-testContext.mockLnd.RegisterSpendChannel)
+		require.Equal(t, spendReg.Load().PkScript, pkScript)
 	}()
 
 	// We'll now try to lock the reservation.
@@ -90,7 +92,7 @@ func TestManager(t *testing.T) {
 	require.Error(t, err)
 
 	testContext.mockLnd.SpendChannel <- &chainntnfs.SpendDetail{
-		SpentOutPoint: spendReg.Outpoint,
+		SpentOutPoint: spendReg.Load().Outpoint,
 	}
 
 	// We'll now expect the reservation to be expired.

loopd/config.go

@@ -423,7 +423,7 @@ func getTLSConfig(cfg *Config) (*tls.Config, *credentials.TransportCredentials,
 	// If the certificate expired or it was outdated, delete it and the TLS
 	// key and generate a new pair.
 	if time.Now().After(parsedCert.NotAfter) {
-		log.Info("TLS certificate is expired or outdated, " +
+		infof("TLS certificate is expired or outdated, " +
 			"removing old file then generating a new one")
 
 		err := os.Remove(cfg.TLSCertPath)
@@ -464,7 +464,7 @@ func loadCertWithCreate(cfg *Config) (tls.Certificate, *x509.Certificate,
 	if !lnrpc.FileExists(cfg.TLSCertPath) &&
 		!lnrpc.FileExists(cfg.TLSKeyPath) {
 
-		log.Infof("Generating TLS certificates...")
+		infof("Generating TLS certificates...")
 		certBytes, keyBytes, err := cert.GenCertPair(
 			defaultSelfSignedOrganization, cfg.TLSExtraIPs,
 			cfg.TLSExtraDomains, cfg.TLSDisableAutofill,
@@ -481,7 +481,7 @@ func loadCertWithCreate(cfg *Config) (tls.Certificate, *x509.Certificate,
 			return tls.Certificate{}, nil, err
 		}
 
-		log.Infof("Done generating TLS certificates")
+		infof("Done generating TLS certificates")
 	}
 
 	return cert.LoadCert(cfg.TLSCertPath, cfg.TLSKeyPath)