Skip to content

trie, consensus/clique: use maps.Clone #2004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2024
Merged

trie, consensus/clique: use maps.Clone #2004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 9 additions & 20 deletions consensus/clique/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ package clique
import (
"bytes"
"encoding/json"
"maps"
"slices"
"time"

lru "github.com/hashicorp/golang-lru"
"slices"

"github.com/CortexFoundation/CortexTheseus/common"
"github.com/CortexFoundation/CortexTheseus/core/rawdb"
Expand Down Expand Up @@ -106,29 +107,17 @@ func (s *Snapshot) store(db ctxcdb.Database) error {
}

// copy creates a deep copy of the snapshot, though not the individual votes.
func (s *Snapshot) deepCopy() *Snapshot {
cpy := &Snapshot{
func (s *Snapshot) copy() *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),
Signers: maps.Clone(s.Signers),
Recents: maps.Clone(s.Recents),
Votes: slices.Clone(s.Votes),
Tally: maps.Clone(s.Tally),
}
for signer := range s.Signers {
cpy.Signers[signer] = struct{}{}
}
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
Expand Down Expand Up @@ -192,7 +181,7 @@ func (s *Snapshot) apply(headers []*types.Header) (*Snapshot, error) {
return nil, errInvalidVotingChain
}
// Iterate through the headers and create a new snapshot
snap := s.deepCopy()
snap := s.copy()

var (
start = time.Now()
Expand Down