From ec7e9d00a476d14d68d5ca753b0ba96aa23b5f54 Mon Sep 17 00:00:00 2001 From: Diego Ximenes Date: Thu, 6 Mar 2025 16:12:15 -0300 Subject: [PATCH] context.Context as an argument to SyncProgressMap --- arbitrum/apibackend.go | 8 ++++---- eth/api_backend.go | 2 +- internal/ethapi/api.go | 4 ++-- internal/ethapi/api_test.go | 2 +- internal/ethapi/backend.go | 2 +- internal/ethapi/transaction_args_test.go | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arbitrum/apibackend.go b/arbitrum/apibackend.go index 15ead482d..eb6470c18 100644 --- a/arbitrum/apibackend.go +++ b/arbitrum/apibackend.go @@ -120,7 +120,7 @@ func CreateFallbackClient(fallbackClientUrl string, fallbackClientTimeout time.D } type SyncProgressBackend interface { - SyncProgressMap() map[string]interface{} + SyncProgressMap(ctx context.Context) map[string]interface{} BlockMetadataByNumber(ctx context.Context, blockNum uint64) (common.BlockMetadata, error) } @@ -205,17 +205,17 @@ func (a *APIBackend) GetBody(ctx context.Context, hash common.Hash, number rpc.B } // General Ethereum API -func (a *APIBackend) SyncProgressMap() map[string]interface{} { +func (a *APIBackend) SyncProgressMap(ctx context.Context) map[string]interface{} { if a.sync == nil { res := make(map[string]interface{}) res["error"] = "sync object not set in apibackend" return res } - return a.sync.SyncProgressMap() + return a.sync.SyncProgressMap(ctx) } func (a *APIBackend) SyncProgress() ethereum.SyncProgress { - progress := a.SyncProgressMap() + progress := a.SyncProgressMap(context.Background()) if len(progress) == 0 { return ethereum.SyncProgress{} diff --git a/eth/api_backend.go b/eth/api_backend.go index 309a43055..582dcc5a4 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -353,7 +353,7 @@ func (b *EthAPIBackend) SubscribeNewTxsEvent(ch chan<- core.NewTxsEvent) event.S return b.eth.txPool.SubscribeTransactions(ch, true) } -func (b *EthAPIBackend) SyncProgressMap() map[string]interface{} { +func (b *EthAPIBackend) SyncProgressMap(ctx context.Context) map[string]interface{} { progress := b.eth.Downloader().Progress() return progress.ToMap() } diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index bbf00b0f7..b6f8f51be 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -156,8 +156,8 @@ func (api *EthereumAPI) BlobBaseFee(ctx context.Context) *hexutil.Big { // - highestBlock: block number of the highest block header this node has received from peers // - pulledStates: number of state entries processed until now // - knownStates: number of known state entries that still need to be pulled -func (api *EthereumAPI) Syncing() (interface{}, error) { - progress := api.b.SyncProgressMap() +func (api *EthereumAPI) Syncing(ctx context.Context) (interface{}, error) { + progress := api.b.SyncProgressMap(ctx) if len(progress) == 0 { return false, nil diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go index 2831dd789..fbd3ca196 100644 --- a/internal/ethapi/api_test.go +++ b/internal/ethapi/api_test.go @@ -636,7 +636,7 @@ func (b testBackend) FallbackClient() types.FallbackClient { return nil } -func (b testBackend) SyncProgressMap() map[string]interface{} { +func (b testBackend) SyncProgressMap(ctx context.Context) map[string]interface{} { return map[string]interface{}{} } diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index c7ac1090f..ba7d7e544 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -44,7 +44,7 @@ type Backend interface { // General Ethereum API SyncProgress() ethereum.SyncProgress - SyncProgressMap() map[string]interface{} + SyncProgressMap(ctx context.Context) map[string]interface{} SuggestGasTipCap(ctx context.Context) (*big.Int, error) FeeHistory(ctx context.Context, blockCount uint64, lastBlock rpc.BlockNumber, rewardPercentiles []float64) (*big.Int, [][]*big.Int, []*big.Int, []float64, []*big.Int, []float64, error) diff --git a/internal/ethapi/transaction_args_test.go b/internal/ethapi/transaction_args_test.go index 0acbc793a..4b665d897 100644 --- a/internal/ethapi/transaction_args_test.go +++ b/internal/ethapi/transaction_args_test.go @@ -413,6 +413,6 @@ func (b *backendMock) FallbackClient() types.FallbackClient { return nil } -func (b *backendMock) SyncProgressMap() map[string]interface{} { +func (b *backendMock) SyncProgressMap(ctx context.Context) map[string]interface{} { return nil }