Merge pull request #6792 from Crypt-iQ/fullcommitflake

htlcswitch: use ticker.New instead of NewForce for test link

docs/release-notes/release-notes-0.16.0.md

@@ -42,6 +42,9 @@ minimum version needed to build the project.
 
 ## Misc
 
+* [Fixed a flake in the TestChannelLinkCancelFullCommitment unit
+  test](https://github.com/lightningnetwork/lnd/pull/6792).
+
 * [Fixed error typo](https://github.com/lightningnetwork/lnd/pull/6659).
 
 * [The macaroon key store implementation was refactored to be more generally
@@ -98,6 +101,7 @@ minimum version needed to build the project.
 * Daniel McNally
 * Elle Mouton
 * ErikEk
+* Eugene Siegel
 * hieblmi
 * Jesse de Wit
 * Matt Morehouse

htlcswitch/test_utils.go

@@ -1166,7 +1166,7 @@ func (h *hopNetwork) createChannelLink(server, peer *mockServer,
 			BatchSize:               10,
 			BatchTicker:             ticker.NewForce(testBatchTimeout),
 			FwdPkgGCTicker:          ticker.NewForce(fwdPkgTimeout),
-			PendingCommitTicker:     ticker.NewForce(2 * time.Minute),
+			PendingCommitTicker:     ticker.New(2 * time.Minute),
 			MinFeeUpdateTimeout:     minFeeUpdateTimeout,
 			MaxFeeUpdateTimeout:     maxFeeUpdateTimeout,
 			OnChannelFailure:        func(lnwire.ChannelID, lnwire.ShortChannelID, LinkFailureError) {},