Merge pull request #9630 from xinhangzhou/master

refactor: use maps.Copy for cleaner map handling

Author: bhandras

accessman.go

@@ -2,6 +2,7 @@ package lnd
 
 import (
 	"fmt"
+	"maps"
 	"sync"
 
 	"github.com/btcsuite/btcd/btcec/v2"
@@ -66,9 +67,7 @@ func newAccessMan(cfg *accessManConfig) (*accessMan, error) {
 	// We'll populate the server's peerCounts map with the counts fetched
 	// via initAccessPerms. Also note that we haven't yet connected to the
 	// peers.
-	for peerPub, count := range counts {
-		a.peerCounts[peerPub] = count
-	}
+	maps.Copy(a.peerCounts, counts)
 
 	return a, nil
 }

channeldb/invoices.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"time"
 
 	"github.com/lightningnetwork/lnd/graph/db/models"
@@ -815,9 +816,7 @@ func (k *kvInvoiceUpdater) UpdateAmpState(setID [32]byte,
 			cancelledHtlcs := k.invoice.HTLCSet(
 				&setID, invpkg.HtlcStateCanceled,
 			)
-			for htlcKey, htlc := range cancelledHtlcs {
-				k.updatedAmpHtlcs[setID][htlcKey] = htlc
-			}
+			maps.Copy(k.updatedAmpHtlcs[setID], cancelledHtlcs)
 
 		case invpkg.HtlcStateSettled:
 			k.updatedAmpHtlcs[setID] = make(
@@ -1438,9 +1437,7 @@ func fetchFilteredAmpInvoices(invoiceBucket kvdb.RBucket, invoiceNum []byte,
 			return nil, err
 		}
 
-		for key, htlc := range htlcsBySetID {
-			htlcs[key] = htlc
-		}
+		maps.Copy(htlcs, htlcsBySetID)
 	}
 
 	return htlcs, nil
@@ -1508,9 +1505,7 @@ func fetchAmpSubInvoices(invoiceBucket kvdb.RBucket, invoiceNum []byte,
 				return err
 			}
 
-			for key, htlc := range htlcsBySetID {
-				htlcs[key] = htlc
-			}
+			maps.Copy(htlcs, htlcsBySetID)
 
 			return nil
 		},

docs/release-notes/release-notes-0.19.0.md

@@ -480,6 +480,9 @@ the on going rate we'll permit.
   inputs spending logic in the sweeper so it can properly handle missing inputs
   and recover from restart.
 
+* A code refactor to [use maps.Copy instead of manually copying map
+   elements](https://github.com/lightningnetwork/lnd/pull/9630).
+
 
 ## Tooling and Documentation
 

kvdb/prefetch_test.go

@@ -2,6 +2,7 @@ package kvdb
 
 import (
 	"fmt"
+	"maps"
 	"testing"
 
 	"github.com/btcsuite/btcwallet/walletdb"
@@ -77,9 +78,7 @@ func prefetchTest(t *testing.T, db walletdb.DB,
 	}, func() {})
 	require.NoError(t, err)
 
-	for k, v := range put {
-		items[k] = v
-	}
+	maps.Copy(items, put)
 
 	for _, k := range remove {
 		delete(items, k)

lnwire/custom_records.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"maps"
 	"sort"
 
 	"github.com/lightningnetwork/lnd/fn/v2"
@@ -94,13 +95,8 @@ func (c CustomRecords) Copy() CustomRecords {
 // records will be used.
 func (c CustomRecords) MergedCopy(other CustomRecords) CustomRecords {
 	copiedRecords := make(CustomRecords, len(c))
-	for k, v := range c {
-		copiedRecords[k] = v
-	}
-
-	for k, v := range other {
-		copiedRecords[k] = v
-	}
+	maps.Copy(copiedRecords, c)
+	maps.Copy(copiedRecords, other)
 
 	return copiedRecords
 }

rpcserver.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"math"
 	"net"
 	"net/http"
@@ -3338,9 +3339,7 @@ func (r *rpcServer) GetInfo(_ context.Context,
 		// Add the features to our map of features, allowing over writing of
 		// existing values because features in different sets with the same bit
 		// are duplicated across sets.
-		for bit, feature := range rpcFeatures {
-			features[bit] = feature
-		}
+		maps.Copy(features, rpcFeatures)
 	}
 
 	// TODO(roasbeef): add synced height n stuff

watchtower/wtclient/client.go

@@ -5,6 +5,7 @@ import (
 	"crypto/rand"
 	"errors"
 	"fmt"
+	"maps"
 	"math/big"
 	"net"
 	"sync"
@@ -1252,9 +1253,7 @@ func (c *client) handleNewTower(tower *Tower) error {
 		return fmt.Errorf("unable to determine sessions for tower %x: "+
 			"%v", tower.IdentityKey.SerializeCompressed(), err)
 	}
-	for id, session := range sessions {
-		c.candidateSessions[id] = session
-	}
+	maps.Copy(c.candidateSessions, sessions)
 
 	return nil
 }