From 1cee4dddb7677d22370dc3ec3ffad06e89eb9a9b Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Mon, 28 Aug 2023 17:36:54 +0530 Subject: [PATCH 1/2] fix : eth_getLogs --- cmd/utils/flags.go | 5 ++++- eth/filters/filter_system_test.go | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index d41bd77b79..efbe4550ca 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -2170,11 +2170,14 @@ func RegisterFilterAPI(stack *node.Node, backend ethapi.Backend, ethcfg *ethconf LogCacheSize: ethcfg.FilterLogCacheSize, }) + filterAPI := filters.NewFilterAPI(filterSystem, isLightClient, ethconfig.Defaults.BorLogs) stack.RegisterAPIs([]rpc.API{{ Namespace: "eth", - Service: filters.NewFilterAPI(filterSystem, isLightClient, ethconfig.Defaults.BorLogs), + Service: filterAPI, }}) + // avoiding constructor changed by introducing new method to set genesis + filterAPI.SetChainConfig(ethcfg.Genesis.Config) return filterSystem } diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index dc88b1ba68..44c160964f 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -490,6 +490,7 @@ func TestInvalidGetLogsRequest(t *testing.T) { api = NewFilterAPI(sys, false, true) blockHash = common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111111") ) + api.SetChainConfig(params.BorUnittestChainConfig) // Reason: Cannot specify both BlockHash and FromBlock/ToBlock) testCases := []FilterCriteria{ @@ -808,6 +809,7 @@ func TestPendingLogsSubscription(t *testing.T) { <-testCases[i].sub.Err() } } + // nolint:gocognit func TestLightFilterLogs(t *testing.T) { t.Parallel() From 9eb44ad01fe61ddfd7119bb7ed05a11343fe4e73 Mon Sep 17 00:00:00 2001 From: Shivam Sharma Date: Mon, 28 Aug 2023 17:55:31 +0530 Subject: [PATCH 2/2] fix : lint --- cmd/utils/flags.go | 1 + eth/filters/filter_system_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index efbe4550ca..0313149341 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -2178,6 +2178,7 @@ func RegisterFilterAPI(stack *node.Node, backend ethapi.Backend, ethcfg *ethconf // avoiding constructor changed by introducing new method to set genesis filterAPI.SetChainConfig(ethcfg.Genesis.Config) + return filterSystem } diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index 44c160964f..43d79f3723 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -490,6 +490,7 @@ func TestInvalidGetLogsRequest(t *testing.T) { api = NewFilterAPI(sys, false, true) blockHash = common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111111") ) + api.SetChainConfig(params.BorUnittestChainConfig) // Reason: Cannot specify both BlockHash and FromBlock/ToBlock)