From c6ecb10865b531d88f9fd022907b8301de6d0058 Mon Sep 17 00:00:00 2001 From: Keagan McClelland Date: Fri, 2 Feb 2024 18:46:24 -0800 Subject: [PATCH] chainreg+lnd: remove ChannelConstraints from PartialChainControl --- chainreg/chainregistry.go | 7 ------- config_builder.go | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/chainreg/chainregistry.go b/chainreg/chainregistry.go index 93d5c1dd1..89ca044da 100644 --- a/chainreg/chainregistry.go +++ b/chainreg/chainregistry.go @@ -166,10 +166,6 @@ type PartialChainControl struct { // MinHtlcIn is the minimum HTLC we will accept. MinHtlcIn lnwire.MilliSatoshi - - // ChannelConstraints is the set of default constraints that will be - // used for any incoming or outgoing channel reservation requests. - ChannelConstraints channeldb.ChannelConstraints } // ChainControl couples the three primary interfaces lnd utilizes for a @@ -715,9 +711,6 @@ func NewPartialChainControl(cfg *Config) (*PartialChainControl, func(), error) { return nil, nil, err } - // Select the default channel constraints for the primary chain. - cc.ChannelConstraints = GenDefaultBtcConstraints() - return cc, ccCleanup, nil } diff --git a/config_builder.go b/config_builder.go index 1a810291a..5ea550321 100644 --- a/config_builder.go +++ b/config_builder.go @@ -693,7 +693,7 @@ func (d *DefaultWalletImpl) BuildChainControl( FeeEstimator: partialChainControl.FeeEstimator, SecretKeyRing: keyRing, ChainIO: walletController, - DefaultConstraints: partialChainControl.ChannelConstraints, + DefaultConstraints: chainreg.GenDefaultBtcConstraints(), NetParams: *walletConfig.NetParams, } @@ -808,7 +808,7 @@ func (d *RPCSignerWalletImpl) BuildChainControl( FeeEstimator: partialChainControl.FeeEstimator, SecretKeyRing: rpcKeyRing, ChainIO: walletController, - DefaultConstraints: partialChainControl.ChannelConstraints, + DefaultConstraints: chainreg.GenDefaultBtcConstraints(), NetParams: *walletConfig.NetParams, }