diff --git a/chanbackup/pubsub.go b/chanbackup/pubsub.go index e4245eb9..580fb927 100644 --- a/chanbackup/pubsub.go +++ b/chanbackup/pubsub.go @@ -230,10 +230,10 @@ func (s *SubSwapper) backupUpdater() { // For all closed channels, we'll remove the prior // backup state. - for _, closedChan := range chanUpdate.ClosedChans { + for i, closedChan := range chanUpdate.ClosedChans { log.Debugf("Removing channel %v from backup "+ "state", newLogClosure(func() string { - return closedChan.String() + return chanUpdate.ClosedChans[i].String() })) delete(s.backupState, closedChan) diff --git a/chanbackup/recover.go b/chanbackup/recover.go index 8619c880..89c09458 100644 --- a/chanbackup/recover.go +++ b/chanbackup/recover.go @@ -42,7 +42,7 @@ type PeerConnector interface { func Recover(backups []Single, restorer ChannelRestorer, peerConnector PeerConnector) error { - for _, backup := range backups { + for i, backup := range backups { log.Infof("Restoring ChannelPoint(%v) to disk: ", backup.FundingOutpoint) @@ -55,7 +55,7 @@ func Recover(backups []Single, restorer ChannelRestorer, "restore ChannelPoint(%v)", backup.RemoteNodePub.SerializeCompressed(), newLogClosure(func() string { - return spew.Sdump(backup.Addresses) + return spew.Sdump(backups[i].Addresses) }), backup.FundingOutpoint) err = peerConnector.ConnectPeer( diff --git a/utxonursery.go b/utxonursery.go index c544e2a3..c5397581 100644 --- a/utxonursery.go +++ b/utxonursery.go @@ -455,9 +455,11 @@ func (u *utxoNursery) IncubateOutputs(chanPoint wire.OutPoint, // We'll examine all the baby outputs just inserted into the database, // if the output has already expired, then we'll *immediately* sweep // it. This may happen if the caller raced a block to call this method. - for _, babyOutput := range babyOutputs { + for i, babyOutput := range babyOutputs { if uint32(bestHeight) >= babyOutput.expiry { - err = u.sweepCribOutput(babyOutput.expiry, &babyOutput) + err = u.sweepCribOutput( + babyOutput.expiry, &babyOutputs[i], + ) if err != nil { return err } @@ -468,9 +470,9 @@ func (u *utxoNursery) IncubateOutputs(chanPoint wire.OutPoint, // confirmation notification that will transition it to the // kindergarten bucket. if len(kidOutputs) != 0 { - for _, kidOutput := range kidOutputs { + for i := range kidOutputs { err := u.registerPreschoolConf( - &kidOutput, broadcastHeight, + &kidOutputs[i], broadcastHeight, ) if err != nil { return err