tapcfg+tapgarden: remove conditions around proof courier

Now that we have enabled a proof courier for all integration tests, we
don't need to conditionally load the config anymore.

Author: guggero

tapcfg/server.go

@@ -231,18 +231,6 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger,
 		}
 	}
 
-	// TODO(ffranr): This logic is leftover for integration tests which
-	//  do not yet enable a proof courier. Remove once all integration tests
-	//  support a proof courier.
-	var proofCourierCfg *proof.CourierCfg
-	if cfg.HashMailCourier != nil {
-		proofCourierCfg = &proof.CourierCfg{
-			ReceiverAckTimeout: cfg.HashMailCourier.ReceiverAckTimeout,
-			BackoffCfg:         cfg.HashMailCourier.BackoffCfg,
-			TransferLog:        assetStore,
-		}
-	}
-
 	reOrgWatcher := tapgarden.NewReOrgWatcher(&tapgarden.ReOrgWatcherConfig{
 		ChainBridge: chainBridge,
 		GroupVerifier: tapgarden.GenGroupVerifier(
@@ -330,6 +318,15 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger,
 		ChainParams:  &tapChainParams,
 	})
 
+	// Addresses can have different proof couriers configured, but both
+	// types of couriers that currently exist will receive this config upon
+	// initialization.
+	proofCourierCfg := &proof.CourierCfg{
+		ReceiverAckTimeout: cfg.HashMailCourier.ReceiverAckTimeout,
+		BackoffCfg:         cfg.HashMailCourier.BackoffCfg,
+		TransferLog:        assetStore,
+	}
+
 	return &tap.Config{
 		DebugLevel:   cfg.DebugLevel,
 		RuntimeID:    runtimeID,

tapgarden/custodian.go

@@ -400,13 +400,6 @@ func (c *Custodian) inspectWalletTx(walletTx *lndclient.Transaction) error {
 			continue
 		}
 
-		// TODO(ffranr): This proof courier disabled check should be
-		//  removed. It was implemented because some integration test do
-		//  not setup and use a proof courier.
-		if c.cfg.ProofCourierCfg == nil {
-			continue
-		}
-
 		// Now that we've seen this output on chain, we'll launch a
 		// goroutine to use the ProofCourier to import the proof into
 		// our local DB.