akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

funding+server: make FindChannel return OpenChannel instead of LightningChannel

Browse Source
This commit is contained in:
Johan T. Halseth 2018-09-26 11:12:57 +02:00
parent 240318befe
commit addb4aed89
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fundingmanager.go
View File

@ -267,7 +267,7 @@ type fundingConfig struct {
// FindChannel queries the database for the channel with the given // FindChannel queries the database for the channel with the given
// channel ID. // channel ID.
FindChannel func(chanID lnwire.ChannelID) (*lnwallet.LightningChannel, error) FindChannel func(chanID lnwire.ChannelID) (*channeldb.OpenChannel, error)
// TempChanIDSeed is a cryptographically random string of bytes that's // TempChanIDSeed is a cryptographically random string of bytes that's
// used as a seed to generate pending channel ID's. // used as a seed to generate pending channel ID's.
@ -2323,10 +2323,9 @@ func (f *fundingManager) handleFundingLocked(fmsg *fundingLockedMsg) {
// If the RemoteNextRevocation is non-nil, it means that we have // If the RemoteNextRevocation is non-nil, it means that we have
// already processed fundingLocked for this channel, so ignore. // already processed fundingLocked for this channel, so ignore.
if channel.RemoteNextRevocation() != nil { if channel.RemoteNextRevocation != nil {
fndgLog.Infof("Received duplicate fundingLocked for "+ fndgLog.Infof("Received duplicate fundingLocked for "+
"ChannelID(%v), ignoring.", chanID) "ChannelID(%v), ignoring.", chanID)
channel.Stop()
return return
} }
@ -2334,10 +2333,9 @@ func (f *fundingManager) handleFundingLocked(fmsg *fundingLockedMsg) {
// need to create the next commitment state for the remote party. So // need to create the next commitment state for the remote party. So
// we'll insert that into the channel now before passing it along to // we'll insert that into the channel now before passing it along to
// other sub-systems. // other sub-systems.
err = channel.InitNextRevocation(fmsg.msg.NextPerCommitmentPoint) err = channel.InsertNextRevocation(fmsg.msg.NextPerCommitmentPoint)
if err != nil { if err != nil {
fndgLog.Errorf("unable to insert next commitment point: %v", err) fndgLog.Errorf("unable to insert next commitment point: %v", err)
channel.Stop()
return return
} }
@ -2361,8 +2359,7 @@ func (f *fundingManager) handleFundingLocked(fmsg *fundingLockedMsg) {
if err := fmsg.peer.AddNewChannel(channel, f.quit); err != nil { if err := fmsg.peer.AddNewChannel(channel, f.quit); err != nil {
fndgLog.Errorf("Unable to add new channel %v with peer %x: %v", fndgLog.Errorf("Unable to add new channel %v with peer %x: %v",
fmsg.peer.IdentityKey().SerializeCompressed(), fmsg.peer.IdentityKey().SerializeCompressed(),
*channel.ChanPoint, err) channel.FundingOutpoint, err)
channel.Stop()
} }
} }

9
server.go
View File

@ -743,7 +743,9 @@ func newServer(listenAddrs []net.Addr, chanDB *channeldb.DB, cc *chainControl,
}, },
NotifyWhenOnline: s.NotifyWhenOnline, NotifyWhenOnline: s.NotifyWhenOnline,
TempChanIDSeed: chanIDSeed, TempChanIDSeed: chanIDSeed,
FindChannel: func(chanID lnwire.ChannelID) (*lnwallet.LightningChannel, error) { FindChannel: func(chanID lnwire.ChannelID) (
*channeldb.OpenChannel, error) {
dbChannels, err := chanDB.FetchAllChannels() dbChannels, err := chanDB.FetchAllChannels()
if err != nil { if err != nil {
return nil, err return nil, err
@ -751,10 +753,7 @@ func newServer(listenAddrs []net.Addr, chanDB *channeldb.DB, cc *chainControl,
for _, channel := range dbChannels { for _, channel := range dbChannels {
if chanID.IsChanPoint(&channel.FundingOutpoint) { if chanID.IsChanPoint(&channel.FundingOutpoint) {
return lnwallet.NewLightningChannel( return channel, nil
cc.signer, s.witnessBeacon,
channel,
)
} }
} }