@@ -649,6 +649,7 @@ func initialCommitmentKeyRingFromState(chanState *channeldb.OpenChannel,
649649 }
650650
651651 commitPoint := input .ComputeCommitmentPoint (revocation [:])
652+
652653 return DeriveCommitmentKeys (
653654 commitPoint , lntypes .Local , chanState .ChanType ,
654655 & chanState .LocalChanCfg , & chanState .RemoteChanCfg ,
@@ -670,12 +671,6 @@ func initialCommitmentKeyRingFromState(chanState *channeldb.OpenChannel,
670671 }
671672}
672673
673- func (lc * LightningChannel ) initialCommitmentKeyRing (
674- whoseCommit lntypes.ChannelParty ) * CommitmentKeyRing {
675-
676- return initialCommitmentKeyRingFromState (lc .channelState , whoseCommit )
677- }
678-
679674// diskCommitToMemCommit converts the on-disk commitment format to our
680675// in-memory commitment format which is needed in order to properly resume
681676// channel operations after a restart.
@@ -8590,8 +8585,8 @@ func NewLocalForceCloseSummary(chanState *channeldb.OpenChannel,
85908585 SignDesc : commitResolution .SelfOutputSignDesc ,
85918586 KeyRing : keyRing ,
85928587 InitialKeyRing : initialKeyRing ,
8593- CsvDelay : csvTimeout ,
8594- CommitFee : chanState .LocalCommitment .CommitFee ,
8588+ CsvDelay : csvTimeout ,
8589+ CommitFee : chanState .LocalCommitment .CommitFee ,
85958590 })
85968591 },
85978592 )
0 commit comments