htlcswitch: add context to AddLink

And hence remove the context.TODO that was previously left there.

Leave a TODO in the peer package for a later PR.

Author: ellemouton

htlcswitch/link_test.go

@@ -2253,7 +2253,7 @@ func newSingleLinkTestHarness(t *testing.T, chanAmt,
 
 	aliceLink := NewChannelLink(aliceCfg, aliceLc.channel)
 	start := func() error {
-		return aliceSwitch.AddLink(aliceLink)
+		return aliceSwitch.AddLink(context.Background(), aliceLink)
 	}
 	go func() {
 		if chanLink, ok := aliceLink.(*channelLink); ok {
@@ -4944,9 +4944,11 @@ func (h *persistentLinkHarness) restartLink(
 	}
 
 	aliceLink := NewChannelLink(aliceCfg, aliceChannel)
-	if err := h.hSwitch.AddLink(aliceLink); err != nil {
+	err := h.hSwitch.AddLink(context.Background(), aliceLink)
+	if err != nil {
 		return nil, nil, err
 	}
+
 	go func() {
 		if chanLink, ok := aliceLink.(*channelLink); ok {
 			for {

htlcswitch/switch.go

@@ -2030,18 +2030,17 @@ func (s *Switch) Stop() error {
 
 // CreateAndAddLink will create a link and then add it to the internal maps
 // when given a ChannelLinkConfig and LightningChannel.
-func (s *Switch) CreateAndAddLink(linkCfg ChannelLinkConfig,
-	lnChan *lnwallet.LightningChannel) error {
+func (s *Switch) CreateAndAddLink(ctx context.Context,
+	linkCfg ChannelLinkConfig, lnChan *lnwallet.LightningChannel) error {
 
 	link := NewChannelLink(linkCfg, lnChan)
-	return s.AddLink(link)
+
+	return s.AddLink(ctx, link)
 }
 
 // AddLink is used to initiate the handling of the add link command. The
 // request will be propagated and handled in the main goroutine.
-func (s *Switch) AddLink(link ChannelLink) error {
-	ctx := context.TODO()
-
+func (s *Switch) AddLink(ctx context.Context, link ChannelLink) error {
 	s.indexMtx.Lock()
 	defer s.indexMtx.Unlock()