gidlid cleanup & lint fixes

Ethernal-Tech · Mar 22, 2024 · c2dd121 · c2dd121
1 parent 4e6cd79
commit c2dd121
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/blockchain/storage/leveldb/leveldb_perf_test.go b/blockchain/storage/leveldb/leveldb_perf_test.go
@@ -166,7 +166,7 @@ func prepareBatch(t *testing.T, s storage.Storage, b *types.FullBlock) *storage.
 
 	batchWriter := storage.NewBatchWriter(s)
 
-	// GidLid 'sorted'
+	// Lookup 'sorted'
 	batchWriter.PutHeadHash(b.Block.Header.Hash)
 	batchWriter.PutHeadNumber(b.Block.Number())
 
@@ -205,7 +205,7 @@ func TestWriteBlockPerf(t *testing.T) {
 		}
 
 		d := time.Since(tn)
-		watchTime = watchTime + d.Milliseconds()
+		watchTime += d.Milliseconds()
 	}
 
 	time.Sleep(time.Second)
@@ -234,7 +234,7 @@ func TestReadBlockPerf(t *testing.T) {
 		_, err4 := s.ReadReceipts(h)
 		d := time.Since(tn)
 
-		watchTime = watchTime + d.Milliseconds()
+		watchTime += d.Milliseconds()
 
 		if !ok || err2 != nil || err3 != nil || err4 != nil {
 			t.Logf("\terror")

diff --git a/blockchain/storagev2/leveldb/leveldb.go b/blockchain/storagev2/leveldb/leveldb.go
@@ -20,7 +20,7 @@ var tableMapper = map[uint8][]byte{
 	storagev2.RECEIPTS:   []byte("r"), // DB key = block number + block hash + mapper, value = block receipts
 	storagev2.CANONICAL:  {},          // DB key = block number + mapper, value = block hash
 
-	// GidLid DB
+	// Lookup DB
 	storagev2.FORK:         {}, // DB key = FORK_KEY + mapper, value = fork hashes
 	storagev2.HEAD_HASH:    {}, // DB key = HEAD_HASH_KEY + mapper, value = head hash
 	storagev2.HEAD_NUMBER:  {}, // DB key = HEAD_NUMBER_KEY + mapper, value = head number
@@ -39,26 +39,26 @@ func NewLevelDBStorage(path string, logger hclog.Logger) (*storagev2.Storage, er
 		WriteBuffer:        128 * opt.MiB, // Two of these are used internally
 	}
 
-	db, err := openLevelDBStorage(path, options)
+	maindb, err := openLevelDBStorage(path, options)
 	if err != nil {
 		return nil, err
 	}
 
-	// Open GidLid
+	// Open Lookup
 	// Set default options
 	options = &opt.Options{
 		BlockCacheCapacity: 64 * opt.MiB,
 		WriteBuffer:        opt.DefaultWriteBuffer,
 	}
-	path = path + "/gidlid"
+	path += "/lookup"
 
-	gidlid, err := openLevelDBStorage(path, options)
+	lookup, err := openLevelDBStorage(path, options)
 	if err != nil {
 		return nil, err
 	}
 
-	ldbs[0] = &levelDB{db}
-	ldbs[1] = &levelDB{gidlid}
+	ldbs[0] = &levelDB{maindb}
+	ldbs[1] = &levelDB{lookup}
 
 	return storagev2.Open(logger.Named("leveldb"), ldbs)
 }

diff --git a/blockchain/storagev2/leveldb/leveldb_perf_test.go b/blockchain/storagev2/leveldb/leveldb_perf_test.go
@@ -76,7 +76,7 @@ func TestWriteBlockPerf(t *testing.T) {
 		require.NoError(t, batchWriter.WriteBatch())
 
 		d := time.Since(tn)
-		watchTime = watchTime + d.Milliseconds()
+		watchTime += d.Milliseconds()
 	}
 
 	time.Sleep(time.Second)
@@ -106,7 +106,7 @@ func TestReadBlockPerf(t *testing.T) {
 		b, err5 := s.ReadBlockLookup(h)
 		d := time.Since(tn)
 
-		watchTime = watchTime + d.Milliseconds()
+		watchTime += d.Milliseconds()
 
 		if !ok || err1 != nil || err3 != nil || err4 != nil || err5 != nil {
 			t.Logf("\terror")

diff --git a/blockchain/storagev2/mdbx/mdbx_perf_test.go b/blockchain/storagev2/mdbx/mdbx_perf_test.go
@@ -51,7 +51,7 @@ func TestWriteBlockPerf(t *testing.T) {
 		require.NoError(t, batchWriter.WriteBatch())
 
 		d := time.Since(tn)
-		watchTime = watchTime + d.Milliseconds()
+		watchTime += d.Milliseconds()
 	}
 
 	time.Sleep(time.Second)
@@ -81,7 +81,7 @@ func TestReadBlockPerf(t *testing.T) {
 		b, err5 := s.ReadBlockLookup(h)
 		d := time.Since(tn)
 
-		watchTime = watchTime + d.Milliseconds()
+		watchTime += d.Milliseconds()
 
 		if !ok || err1 != nil || err3 != nil || err4 != nil || err5 != nil {
 			t.Logf("\terror")

diff --git a/blockchain/storagev2/storage.go b/blockchain/storagev2/storage.go
@@ -38,7 +38,7 @@ const (
 	RECEIPTS   = uint8(8)
 )
 
-// GidLid tables
+// Lookup tables
 const (
 	FORK         = uint8(0) | LOOKUP_INDEX
 	HEAD_HASH    = uint8(2) | LOOKUP_INDEX

diff --git a/blockchain/storagev2/testing_perf.go b/blockchain/storagev2/testing_perf.go
@@ -118,7 +118,7 @@ func PrepareBatch(t *testing.T, s *Storage, b *types.FullBlock) *Writer {
 
 	batchWriter := s.NewWriter()
 
-	// GidLid 'sorted'
+	// Lookup 'sorted'
 	batchWriter.PutHeadHash(b.Block.Header.Hash)
 	batchWriter.PutHeadNumber(b.Block.Number())
 	batchWriter.PutBlockLookup(b.Block.Hash(), b.Block.Number())