CR updates

Author: cce

agreement/fuzzer/ledger_test.go

@@ -153,7 +153,6 @@ func makeTestLedger(state map[basics.Address]basics.AccountData, sync testLedger
 	l.certs = make(map[basics.Round]agreement.Certificate)
 	l.nextRound = 1
 
-	// deep copy of state
 	l.state = make(map[basics.Address]basics.AccountData)
 	maps.Copy(l.state, state)
 

ledger/acctupdates_test.go

@@ -168,13 +168,12 @@ func (ml *mockLedgerForTracker) fork(t testing.TB) *mockLedgerForTracker {
 		log:              dblogger,
 		blocks:           make([]blockEntry, len(ml.blocks)),
 		deltas:           make([]ledgercore.StateDelta, len(ml.deltas)),
-		accts:            make(map[basics.Address]basics.AccountData),
+		accts:            maps.Clone(ml.accts),
 		filename:         fn,
 		consensusParams:  ml.consensusParams,
 		consensusVersion: ml.consensusVersion,
 		trackers:         trackerRegistry{log: dblogger},
 	}
-	maps.Copy(newLedgerTracker.accts, ml.accts)
 	copy(newLedgerTracker.blocks, ml.blocks)
 	copy(newLedgerTracker.deltas, ml.deltas)
 

network/multiplexer.go

@@ -84,9 +84,8 @@ func (m *Multiplexer) ValidateHandle(msg IncomingMessage) OutgoingMessage {
 
 func registerMultiplexer[T any](target *atomic.Value, dispatch []taggedMessageDispatcher[T]) {
 	mp := make(map[Tag]T)
-	if existingMap := getMap[T](target); existingMap != nil {
-		maps.Copy(mp, existingMap)
-	}
+	existingMap := getMap[T](target)
+	maps.Copy(mp, existingMap)
 	for _, v := range dispatch {
 		if _, has := mp[v.Tag]; has {
 			panic(fmt.Sprintf("Already registered a handler for tag %v", v.Tag))