lntest: ensure we always cancel active streaming notifications

This commit is contained in:
Olaoluwa Osuntokun 2018-04-24 20:34:30 -07:00
parent 92029370ec
commit dbf7e4525a
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
3 changed files with 11 additions and 3 deletions

@ -47,6 +47,12 @@ var (
number: 1,
migration: migrateNodeAndEdgeUpdateIndex,
},
{
// The DB version that added the invoice event time
// series.
number: 2,
migration: migrateInvoiceTimeSeries,
},
}
// Big endian is the preferred byte order, due to cursor scans over

@ -177,7 +177,7 @@ func deserializeOutgoingPayment(r io.Reader) (*OutgoingPayment, error) {
if err != nil {
return nil, err
}
p.Invoice = *inv
p.Invoice = inv
if _, err := r.Read(scratch[:]); err != nil {
return nil, err

@ -639,9 +639,9 @@ func (hn *HarnessNode) lightningNetworkWatcher() {
go func() {
defer hn.wg.Done()
ctxb := context.Background()
req := &lnrpc.GraphTopologySubscription{}
topologyClient, err := hn.SubscribeChannelGraph(ctxb, req)
ctx, cancelFunc := context.WithCancel(context.Background())
topologyClient, err := hn.SubscribeChannelGraph(ctx, req)
if err != nil {
// We panic here in case of an error as failure to
// create the topology client will cause all subsequent
@ -650,6 +650,8 @@ func (hn *HarnessNode) lightningNetworkWatcher() {
"client: %v", err))
}
defer cancelFunc()
for {
update, err := topologyClient.Recv()
if err == io.EOF {