Use previously Unused bucket for Peers' storage (#1962)

db/buckets.go

@@ -10,7 +10,7 @@ type Bucket byte
 // man's bucket alternative.
 const (
 	StateTrie         Bucket = iota // state metadata (e.g., the state root)
-	Unused                          // Previously held contract storage roots and is now unused. May be reused in the future.
+	Peer                            // maps peer ID to peer multiaddresses
 	ContractClassHash               // maps contract addresses and class hashes
 	ContractStorage                 // contract storages
 	Class                           // maps class hashes to classes
@@ -33,7 +33,6 @@ const (
 	BlockCommitments
 	Temporary // used temporarily for migrations
 	SchemaIntermediateState
-	Peer // maps peer ID to peer multiaddresses
 )
 
 // Key flattens a prefix and series of byte arrays into a single []byte.

migration/migration.go

@@ -210,7 +210,8 @@ func relocateContractStorageRootKeys(txn db.Transaction, _ *utils.Network) error
 	// Iterate over all entries in the old bucket, copying each into memory.
 	// Even with millions of contracts, this shouldn't be too expensive.
 	oldEntries := make(map[string][]byte)
-	oldPrefix := db.Unused.Key()
+	// Previously ContractStorageRoot were stored in the Peer bucket.
+	oldPrefix := db.Peer.Key()
 	var value []byte
 	for it.Seek(oldPrefix); it.Valid(); it.Next() {
 		// Stop iterating once we're out of the old bucket.

migration/migration_pkg_test.go

@@ -54,7 +54,7 @@ func TestRelocateContractStorageRootKeys(t *testing.T) {
 	for i := 0; i < numberOfContracts; i++ {
 		exampleBytes := new(felt.Felt).SetUint64(uint64(i)).Bytes()
 		// Use exampleBytes for the key suffix (the contract address) and the value.
-		err := txn.Set(db.Unused.Key(exampleBytes[:]), exampleBytes[:])
+		err := txn.Set(db.Peer.Key(exampleBytes[:]), exampleBytes[:])
 		require.NoError(t, err)
 	}
 
@@ -72,7 +72,7 @@ func TestRelocateContractStorageRootKeys(t *testing.T) {
 		}))
 
 		// Old entry does not exist.
-		oldKey := db.Unused.Key(exampleBytes[:])
+		oldKey := db.Peer.Key(exampleBytes[:])
 		err := txn.Get(oldKey, func(val []byte) error { return nil })
 		require.ErrorIs(t, db.ErrKeyNotFound, err)
 	}