diff --git a/config.go b/config.go index 7084500b4..6c8df62dd 100644 --- a/config.go +++ b/config.go @@ -627,9 +627,8 @@ func DefaultConfig() Config { RejectCacheSize: channeldb.DefaultRejectCacheSize, ChannelCacheSize: channeldb.DefaultChannelCacheSize, }, - Prometheus: lncfg.DefaultPrometheus(), - Watchtower: lncfg.DefaultWatchtowerCfg(defaultTowerDir), - ProtocolOptions: lncfg.DefaultProtocol(), + Prometheus: lncfg.DefaultPrometheus(), + Watchtower: lncfg.DefaultWatchtowerCfg(defaultTowerDir), HealthChecks: &lncfg.HealthCheckConfig{ ChainCheck: &lncfg.CheckConfig{ Interval: defaultChainInterval, diff --git a/lncfg/protocol.go b/lncfg/protocol.go index 59027a09b..e98b4dcf8 100644 --- a/lncfg/protocol.go +++ b/lncfg/protocol.go @@ -59,14 +59,6 @@ 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 { diff --git a/lncfg/protocol_integration.go b/lncfg/protocol_integration.go index f44aa1246..841f8e9eb 100644 --- a/lncfg/protocol_integration.go +++ b/lncfg/protocol_integration.go @@ -62,13 +62,6 @@ 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 {