From 3c6a22a0b89e2eecd8afee43b8f68ea2d467bb66 Mon Sep 17 00:00:00 2001 From: Tangui Clairet <181825613+Tangui-Bitfly@users.noreply.github.com> Date: Wed, 29 Jan 2025 17:20:07 +0100 Subject: [PATCH] move directory --- backend/cmd/eth1indexer/main.go | 12 ++++++------ backend/cmd/misc/main.go | 8 ++++---- backend/internal/e2e/e2e_test.go | 6 +++--- backend/pkg/commons/db/bigtable_eth1.go | 6 +++--- .../pkg/{commons/indexer => executionlayer}/cache.go | 2 +- .../{commons/indexer => executionlayer}/indexer.go | 4 ++-- .../indexer => executionlayer}/indexer_test.go | 4 ++-- .../indexer => executionlayer}/transformer.go | 2 +- .../pkg/{commons/indexer => executionlayer}/utils.go | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) rename backend/pkg/{commons/indexer => executionlayer}/cache.go (90%) rename backend/pkg/{commons/indexer => executionlayer}/indexer.go (93%) rename backend/pkg/{commons/indexer => executionlayer}/indexer_test.go (98%) rename backend/pkg/{commons/indexer => executionlayer}/transformer.go (99%) rename backend/pkg/{commons/indexer => executionlayer}/utils.go (98%) diff --git a/backend/cmd/eth1indexer/main.go b/backend/cmd/eth1indexer/main.go index 9d2aec24e..8c4a71f26 100644 --- a/backend/cmd/eth1indexer/main.go +++ b/backend/cmd/eth1indexer/main.go @@ -23,7 +23,6 @@ import ( "github.com/gobitfly/beaconchain/pkg/commons/db2/database" "github.com/gobitfly/beaconchain/pkg/commons/db2/metadataupdates" "github.com/gobitfly/beaconchain/pkg/commons/erc20" - "github.com/gobitfly/beaconchain/pkg/commons/indexer" "github.com/gobitfly/beaconchain/pkg/commons/log" "github.com/gobitfly/beaconchain/pkg/commons/metrics" "github.com/gobitfly/beaconchain/pkg/commons/rpc" @@ -31,6 +30,7 @@ import ( "github.com/gobitfly/beaconchain/pkg/commons/types" "github.com/gobitfly/beaconchain/pkg/commons/utils" "github.com/gobitfly/beaconchain/pkg/commons/version" + "github.com/gobitfly/beaconchain/pkg/executionlayer" "github.com/coocood/freecache" "github.com/ethereum/go-ethereum/common" @@ -190,10 +190,10 @@ func Run() { log.Fatal(err, "error connecting to bigtable", 0) } - indxr := indexer.New( + indexer := executionlayer.NewIndexer( data.NewStore(database.Wrap(bigtable, data.Table)), metadataupdates.NewStore(database.Wrap(bigtable, metadataupdates.Table)), - indexer.NewTransformer(cache).All()..., + executionlayer.NewTransformer(cache).All()..., ) if *block != 0 { @@ -201,7 +201,7 @@ func Run() { if err != nil { log.Fatal(err, "error indexing from node", 0, map[string]interface{}{"block": *block, "concurrency": *concurrencyBlocks}) } - err = bt.IndexEventsWithIndexer(*block, *block, indxr, *concurrencyData) + err = bt.IndexEventsWithIndexer(*block, *block, indexer, *concurrencyData) if err != nil { log.Fatal(err, "error indexing from bigtable", 0) } @@ -237,7 +237,7 @@ func Run() { } if *endData != 0 && *startData < *endData { - err = bt.IndexEventsWithIndexer(*startData, *endData, indxr, *concurrencyData) + err = bt.IndexEventsWithIndexer(*startData, *endData, indexer, *concurrencyData) if err != nil { log.Fatal(err, "error indexing from bigtable", 0) } @@ -340,7 +340,7 @@ func Run() { endBlock = int64(lastBlockFromNode) } - err = bt.IndexEventsWithIndexer(startBlock, endBlock, indxr, *concurrencyData) + err = bt.IndexEventsWithIndexer(startBlock, endBlock, indexer, *concurrencyData) if err != nil { log.Error(err, "error indexing from bigtable", 0, map[string]interface{}{"start": startBlock, "end": endBlock, "concurrency": *concurrencyData}) cache.Clear() diff --git a/backend/cmd/misc/main.go b/backend/cmd/misc/main.go index 649a895a9..c072ee64a 100644 --- a/backend/cmd/misc/main.go +++ b/backend/cmd/misc/main.go @@ -38,13 +38,13 @@ import ( "github.com/gobitfly/beaconchain/pkg/commons/db2/data" "github.com/gobitfly/beaconchain/pkg/commons/db2/database" "github.com/gobitfly/beaconchain/pkg/commons/db2/metadataupdates" - "github.com/gobitfly/beaconchain/pkg/commons/indexer" "github.com/gobitfly/beaconchain/pkg/commons/log" "github.com/gobitfly/beaconchain/pkg/commons/rpc" "github.com/gobitfly/beaconchain/pkg/commons/types" "github.com/gobitfly/beaconchain/pkg/commons/utils" "github.com/gobitfly/beaconchain/pkg/commons/version" "github.com/gobitfly/beaconchain/pkg/consapi" + "github.com/gobitfly/beaconchain/pkg/executionlayer" edb "github.com/gobitfly/beaconchain/pkg/exporter/db" "github.com/gobitfly/beaconchain/pkg/exporter/modules" "github.com/gobitfly/beaconchain/pkg/exporter/services" @@ -1626,12 +1626,12 @@ func indexOldEth1Blocks(startBlock uint64, endBlock uint64, batchSize uint64, co log.Fatal(err, "error connecting to bigtable", 0) } cache := freecache.NewCache(100 * 1024 * 1024) // 100 MB limit - transforms, err := indexer.NewTransformer(cache).FromList(transformerList) + transforms, err := executionlayer.NewTransformer(cache).FromList(transformerList) if err != nil { log.Error(nil, err.Error(), 0) return } - indxr := indexer.New( + indexer := executionlayer.NewIndexer( data.NewStore(database.Wrap(bigtable, data.Table)), metadataupdates.NewStore(database.Wrap(bigtable, metadataupdates.Table)), transforms..., @@ -1659,7 +1659,7 @@ func indexOldEth1Blocks(startBlock uint64, endBlock uint64, batchSize uint64, co toBlock := utilMath.MinU64(to, from+blockCount-1) log.Infof("indexing blocks %v to %v in data table ...", from, toBlock) - err := bt.IndexEventsWithIndexer(int64(from), int64(toBlock), indxr, int64(concurrency)) + err := bt.IndexEventsWithIndexer(int64(from), int64(toBlock), indexer, int64(concurrency)) if err != nil { log.Error(err, "error indexing from bigtable", 0) } diff --git a/backend/internal/e2e/e2e_test.go b/backend/internal/e2e/e2e_test.go index 2a0132561..c2ac7e598 100644 --- a/backend/internal/e2e/e2e_test.go +++ b/backend/internal/e2e/e2e_test.go @@ -14,9 +14,9 @@ import ( "github.com/gobitfly/beaconchain/pkg/commons/db2/database" "github.com/gobitfly/beaconchain/pkg/commons/db2/database/databasetest" "github.com/gobitfly/beaconchain/pkg/commons/db2/metadataupdates" - "github.com/gobitfly/beaconchain/pkg/commons/indexer" "github.com/gobitfly/beaconchain/pkg/commons/rpc" "github.com/gobitfly/beaconchain/pkg/commons/types" + "github.com/gobitfly/beaconchain/pkg/executionlayer" ) func TestStoreWithBackend(t *testing.T) { @@ -31,8 +31,8 @@ func TestStoreWithBackend(t *testing.T) { backend := th.NewBackend(t) usdtAddress, usdt := backend.DeployToken(t, "usdt", "usdt", backend.BankAccount.From) - transform := indexer.NewTransformer(indexer.NoopCache{}) - indexer := indexer.New(dataStore, metadataStore, transform.All()...) + transform := executionlayer.NewTransformer(executionlayer.NoopCache{}) + indexer := executionlayer.NewIndexer(dataStore, metadataStore, transform.All()...) client, err := rpc.NewErigonClient(backend.Endpoint) if err != nil { diff --git a/backend/pkg/commons/db/bigtable_eth1.go b/backend/pkg/commons/db/bigtable_eth1.go index 312c0c268..1c13a96ad 100644 --- a/backend/pkg/commons/db/bigtable_eth1.go +++ b/backend/pkg/commons/db/bigtable_eth1.go @@ -16,11 +16,11 @@ import ( "time" "github.com/gobitfly/beaconchain/pkg/commons/cache" - "github.com/gobitfly/beaconchain/pkg/commons/indexer" "github.com/gobitfly/beaconchain/pkg/commons/log" "github.com/gobitfly/beaconchain/pkg/commons/rpc" "github.com/gobitfly/beaconchain/pkg/commons/types" "github.com/gobitfly/beaconchain/pkg/commons/utils" + "github.com/gobitfly/beaconchain/pkg/executionlayer" gcp_bigtable "cloud.google.com/go/bigtable" "golang.org/x/sync/errgroup" @@ -693,7 +693,7 @@ func reversePaddedBigtableTimestamp(timestamp *timestamppb.Timestamp) string { return fmt.Sprintf("%019d", MAX_INT-timestamp.Seconds) } -func (bigtable *Bigtable) IndexEventsWithIndexer(start, end int64, indxr *indexer.Indexer, concurrency int64) error { +func (bigtable *Bigtable) IndexEventsWithIndexer(start, end int64, indexer *executionlayer.Indexer, concurrency int64) error { g := new(errgroup.Group) g.SetLimit(int(concurrency)) @@ -728,7 +728,7 @@ func (bigtable *Bigtable) IndexEventsWithIndexer(start, end int64, indxr *indexe for b := range blocksChan { block := b subG.Go(func() error { - return indxr.IndexBlock(bigtable.chainId, block) + return indexer.IndexBlock(bigtable.chainId, block) }) } return subG.Wait() diff --git a/backend/pkg/commons/indexer/cache.go b/backend/pkg/executionlayer/cache.go similarity index 90% rename from backend/pkg/commons/indexer/cache.go rename to backend/pkg/executionlayer/cache.go index 07f29f60a..aee2f5a6d 100644 --- a/backend/pkg/commons/indexer/cache.go +++ b/backend/pkg/executionlayer/cache.go @@ -1,4 +1,4 @@ -package indexer +package executionlayer import ( "fmt" diff --git a/backend/pkg/commons/indexer/indexer.go b/backend/pkg/executionlayer/indexer.go similarity index 93% rename from backend/pkg/commons/indexer/indexer.go rename to backend/pkg/executionlayer/indexer.go index fbc4a1060..77823dd5f 100644 --- a/backend/pkg/commons/indexer/indexer.go +++ b/backend/pkg/executionlayer/indexer.go @@ -1,4 +1,4 @@ -package indexer +package executionlayer import ( "fmt" @@ -20,7 +20,7 @@ type Indexer struct { transformers []TransformFunc } -func New(dataStore data.Store, metadataUpdatesStore metadataupdates.Store, transformers ...TransformFunc) *Indexer { +func NewIndexer(dataStore data.Store, metadataUpdatesStore metadataupdates.Store, transformers ...TransformFunc) *Indexer { return &Indexer{ data: dataStore, metadataUpdates: metadataUpdatesStore, diff --git a/backend/pkg/commons/indexer/indexer_test.go b/backend/pkg/executionlayer/indexer_test.go similarity index 98% rename from backend/pkg/commons/indexer/indexer_test.go rename to backend/pkg/executionlayer/indexer_test.go index 34be50903..3886c2bba 100644 --- a/backend/pkg/commons/indexer/indexer_test.go +++ b/backend/pkg/executionlayer/indexer_test.go @@ -1,4 +1,4 @@ -package indexer +package executionlayer import ( "context" @@ -141,7 +141,7 @@ func TestIndexer(t *testing.T) { defer dataBigtable.Clear() defer metadataBigtable.Clear() - indexer := New( + indexer := NewIndexer( data.NewStore(database.Wrap(dataBigtable, data.Table)), metadataupdates.NewStore(database.Wrap(metadataBigtable, metadataupdates.Table)), tt.transformers..., diff --git a/backend/pkg/commons/indexer/transformer.go b/backend/pkg/executionlayer/transformer.go similarity index 99% rename from backend/pkg/commons/indexer/transformer.go rename to backend/pkg/executionlayer/transformer.go index 8a87eb4f3..1eeaa7a6a 100644 --- a/backend/pkg/commons/indexer/transformer.go +++ b/backend/pkg/executionlayer/transformer.go @@ -1,4 +1,4 @@ -package indexer +package executionlayer import ( "bytes" diff --git a/backend/pkg/commons/indexer/utils.go b/backend/pkg/executionlayer/utils.go similarity index 98% rename from backend/pkg/commons/indexer/utils.go rename to backend/pkg/executionlayer/utils.go index 81552a60e..1a4608114 100644 --- a/backend/pkg/commons/indexer/utils.go +++ b/backend/pkg/executionlayer/utils.go @@ -1,4 +1,4 @@ -package indexer +package executionlayer import ( "fmt"