From 7362691479df9eb7d76c8b968ed8f440372fab6e Mon Sep 17 00:00:00 2001
From: Aaron Chen <aaronchen.lisp@gmail.com>
Date: Wed, 24 Apr 2024 20:27:58 +0800
Subject: [PATCH] trie, consensus/clique: use maps.Clone (#29616)

---
 consensus/clique/snapshot.go | 23 ++++++-----------------
 trie/tracer.go               | 18 +++++-------------
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go
index 8ff0b3a70f..d0b15e9489 100644
--- a/consensus/clique/snapshot.go
+++ b/consensus/clique/snapshot.go
@@ -19,6 +19,7 @@ package clique
 import (
 	"bytes"
 	"encoding/json"
+	"maps"
 	"slices"
 	"time"
 
@@ -108,28 +109,16 @@ func (s *Snapshot) store(db ethdb.Database) error {
 
 // copy creates a deep copy of the snapshot, though not the individual votes.
 func (s *Snapshot) copy() *Snapshot {
-	cpy := &Snapshot{
+	return &Snapshot{
 		config:   s.config,
 		sigcache: s.sigcache,
 		Number:   s.Number,
 		Hash:     s.Hash,
-		Signers:  make(map[common.Address]struct{}),
-		Recents:  make(map[uint64]common.Address),
-		Votes:    make([]*Vote, len(s.Votes)),
-		Tally:    make(map[common.Address]Tally),
-	}
-	for signer := range s.Signers {
-		cpy.Signers[signer] = struct{}{}
+		Signers:  maps.Clone(s.Signers),
+		Recents:  maps.Clone(s.Recents),
+		Votes:    slices.Clone(s.Votes),
+		Tally:    maps.Clone(s.Tally),
 	}
-	for block, signer := range s.Recents {
-		cpy.Recents[block] = signer
-	}
-	for address, tally := range s.Tally {
-		cpy.Tally[address] = tally
-	}
-	copy(cpy.Votes, s.Votes)
-
-	return cpy
 }
 
 // validVote returns whether it makes sense to cast the specified vote in the
diff --git a/trie/tracer.go b/trie/tracer.go
index 5786af4d3e..90b9666f0b 100644
--- a/trie/tracer.go
+++ b/trie/tracer.go
@@ -17,6 +17,8 @@
 package trie
 
 import (
+	"maps"
+
 	"github.com/ethereum/go-ethereum/common"
 )
 
@@ -92,23 +94,13 @@ func (t *tracer) reset() {
 
 // copy returns a deep copied tracer instance.
 func (t *tracer) copy() *tracer {
-	var (
-		inserts    = make(map[string]struct{})
-		deletes    = make(map[string]struct{})
-		accessList = make(map[string][]byte)
-	)
-	for path := range t.inserts {
-		inserts[path] = struct{}{}
-	}
-	for path := range t.deletes {
-		deletes[path] = struct{}{}
-	}
+	accessList := make(map[string][]byte, len(t.accessList))
 	for path, blob := range t.accessList {
 		accessList[path] = common.CopyBytes(blob)
 	}
 	return &tracer{
-		inserts:    inserts,
-		deletes:    deletes,
+		inserts:    maps.Clone(t.inserts),
+		deletes:    maps.Clone(t.deletes),
 		accessList: accessList,
 	}
 }