forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 14:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glob for network

Browse source
This commit is contained in:
Sina Mahmoodi 2025-04-10 11:48:31 +02:00 committed by lightclient
parent 4a7fcb7b89
commit 2a4e159d20
No known key found for this signature in database
GPG key ID: 657913021EF45A6A
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/rawdb/eradb/eradb.go
View file

@ -30,13 +30,12 @@ import (
type EraDatabase struct { type EraDatabase struct {
datadir string datadir string
network string
// TODO: should take into account configured number of fd handles. // TODO: should take into account configured number of fd handles.
cache *lru.Cache[uint64, *era.Era] cache *lru.Cache[uint64, *era.Era]
} }
// New creates a new EraDatabase instance. // New creates a new EraDatabase instance.
func New(datadir, network string) (*EraDatabase, error) { func New(datadir string) (*EraDatabase, error) {
// Ensure the datadir is not a symbolic link if it exists. // Ensure the datadir is not a symbolic link if it exists.
if info, err := os.Lstat(datadir); !os.IsNotExist(err) { if info, err := os.Lstat(datadir); !os.IsNotExist(err) {
if info == nil { if info == nil {
@ -51,7 +50,7 @@ func New(datadir, network string) (*EraDatabase, error) {
if err := os.MkdirAll(datadir, 0755); err != nil { if err := os.MkdirAll(datadir, 0755); err != nil {
return nil, err return nil, err
} }
db := &EraDatabase{datadir: datadir, network: network, cache: lru.NewCache[uint64, *era.Era](50)} db := &EraDatabase{datadir: datadir, cache: lru.NewCache[uint64, *era.Era](50)}
log.Info("Opened erastore", "datadir", datadir) log.Info("Opened erastore", "datadir", datadir)
return db, nil return db, nil
} }
@ -77,7 +76,7 @@ func (db *EraDatabase) getEraByEpoch(epoch uint64) (*era.Era, error) {
return e, nil return e, nil
} }
// file name scheme is <network>-<epoch>-<root>. // file name scheme is <network>-<epoch>-<root>.
glob := fmt.Sprintf("%s-%05d-*.era1", db.network, epoch) glob := fmt.Sprintf("*-%05d-*.era1", epoch)
matches, err := filepath.Glob(filepath.Join(db.datadir, glob)) matches, err := filepath.Glob(filepath.Join(db.datadir, glob))
if err != nil { if err != nil {
return nil, err return nil, err

2
core/rawdb/eradb/eradb_test.go
View file

@ -24,7 +24,7 @@ import (
func TestEraDatabase(t *testing.T) { func TestEraDatabase(t *testing.T) {
// Create the database // Create the database
db, err := New("testdata", "sepolia") db, err := New("testdata")
require.NoError(t, err) require.NoError(t, err)
defer db.Close() defer db.Close()

3
core/rawdb/freezer.go
View file

@ -125,7 +125,8 @@ func NewFreezer(datadir string, namespace string, readonly bool, maxTableSize ui
// Create the era database. // Create the era database.
// TODO: Pipe down network name. // TODO: Pipe down network name.
edb, err := eradb.New(datadir, "sepolia") eradir := filepath.Join(datadir, "eradb")
edb, err := eradb.New(eradir)
if err != nil { if err != nil {
lock.Unlock() lock.Unlock()
return nil, err return nil, err