lncfg: disable allowing blinded routes in daemon but not itests

This commit turns off route blinding for the daemon while we're waiting
on full handling for blinded errors. The feature remains on for itests
so that tests covering blinding can run as usual.

config.go

@@ -626,8 +626,9 @@ func DefaultConfig() Config {
 			RejectCacheSize:  channeldb.DefaultRejectCacheSize,
 			ChannelCacheSize: channeldb.DefaultChannelCacheSize,
 		},
-		Prometheus: lncfg.DefaultPrometheus(),
+		Prometheus:      lncfg.DefaultPrometheus(),
-		Watchtower: lncfg.DefaultWatchtowerCfg(defaultTowerDir),
+		Watchtower:      lncfg.DefaultWatchtowerCfg(defaultTowerDir),
+		ProtocolOptions: lncfg.DefaultProtocol(),
 		HealthChecks: &lncfg.HealthCheckConfig{
 			ChainCheck: &lncfg.CheckConfig{
 				Interval: defaultChainInterval,

lncfg/protocol.go

@@ -59,6 +59,14 @@ type ProtocolOptions struct {
 	NoRouteBlindingOption bool `long:"no-route-blinding" description:"do not forward payments that are a part of a blinded route"`
 }
 
+// DefaultProtocol returns a protocol config with route blinding turned off,
+// temporarily in place until full handling of blinded route errors is merged.
+func DefaultProtocol() *ProtocolOptions {
+	return &ProtocolOptions{
+		NoRouteBlindingOption: true,
+	}
+}
+
 // Wumbo returns true if lnd should permit the creation and acceptance of wumbo
 // channels.
 func (l *ProtocolOptions) Wumbo() bool {

lncfg/protocol_integration.go

@@ -62,6 +62,13 @@ type ProtocolOptions struct {
 	NoRouteBlindingOption bool `long:"no-route-blinding" description:"do not forward payments that are a part of a blinded route"`
 }
 
+// DefaultProtocol returns a protocol config with route blinding turned on,
+// so that itests can run against route blinding features even while we've
+// got it turned off for the daemon (pending completion of error handling).
+func DefaultProtocol() *ProtocolOptions {
+	return &ProtocolOptions{}
+}
+
 // Wumbo returns true if lnd should permit the creation and acceptance of wumbo
 // channels.
 func (l *ProtocolOptions) Wumbo() bool {