status-im/nim-ethers
2
0
Fork 0
mirror of https://github.com/status-im/nim-ethers.git synced 2025-02-21 11:38:13 +00:00
Code Issues Projects Releases Wiki Activity

fix: block filters can be also recreated

Browse Source
This commit is contained in:
Adam Uhlíř 2024-10-24 16:29:45 +02:00
parent 765379a662
commit 1c2610a583
No known key found for this signature in database
GPG Key ID: 1D17A9E81F76155B
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ethers/providers/jsonrpc/subscriptions.nim
View File

@ -164,8 +164,14 @@ proc new*(_: type JsonRpcSubscriptions,
raise e raise e
except CatchableError as e: except CatchableError as e:
if "filter not found" in e.msg: if "filter not found" in e.msg:
let filter = subscriptions.filters[originalId] var newId: JsonNode
let newId = await subscriptions.client.eth_newFilter(filter) # If there exists filter for given ID, then the filter was a log filter
# otherwise it was a block filter
if subscriptions.filters.hasKey(originalId):
let filter = subscriptions.filters[originalId]
newId = await subscriptions.client.eth_newFilter(filter)
else:
newId = await subscriptions.client.eth_newBlockFilter()
subscriptions.subscriptionMapping[originalId] = newId subscriptions.subscriptionMapping[originalId] = newId
return await getChanges(originalId) return await getChanges(originalId)
else: else:

5
testmodule/providers/jsonrpc/rpc_mock.nim
View File

@ -25,6 +25,11 @@ proc start*(server: MockRpcHttpServer) =
server.filters.add filterId server.filters.add filterId
return filterId return filterId
server.srv.router.rpc("eth_newBlockFilter") do() -> string:
let filterId = "0x" & (array[16, byte].example).toHex
server.filters.add filterId
return filterId
server.srv.router.rpc("eth_getFilterChanges") do(id: string) -> seq[string]: server.srv.router.rpc("eth_getFilterChanges") do(id: string) -> seq[string]:
if id notin server.filters: if id notin server.filters:
raise (ref ApplicationError)(code: -32000, msg: "filter not found") raise (ref ApplicationError)(code: -32000, msg: "filter not found")

25
testmodule/providers/jsonrpc/testJsonRpcSubscriptions.nim
View File

@ -124,7 +124,7 @@ suite "HTTP polling subscriptions - filter not found":
await client.close() await client.close()
await mockServer.stop() await mockServer.stop()
test "filter not found error recreates filter": test "filter not found error recreates log filter":
let filter = EventFilter(address: Address.example, topics: @[array[32, byte].example]) let filter = EventFilter(address: Address.example, topics: @[array[32, byte].example])
let emptyHandler = proc(log: Log) = discard let emptyHandler = proc(log: Log) = discard
@ -142,7 +142,7 @@ suite "HTTP polling subscriptions - filter not found":
check eventually subscriptions.subscriptionMapping[id] != id check eventually subscriptions.subscriptionMapping[id] != id
test "recreated filter can be still unsubscribed using the original id": test "recreated log filter can be still unsubscribed using the original id":
let filter = EventFilter(address: Address.example, topics: @[array[32, byte].example]) let filter = EventFilter(address: Address.example, topics: @[array[32, byte].example])
let emptyHandler = proc(log: Log) = discard let emptyHandler = proc(log: Log) = discard
let id = await subscriptions.subscribeLogs(filter, emptyHandler) let id = await subscriptions.subscribeLogs(filter, emptyHandler)
@ -153,3 +153,24 @@ suite "HTTP polling subscriptions - filter not found":
check not subscriptions.filters.hasKey id check not subscriptions.filters.hasKey id
check not subscriptions.subscriptionMapping.hasKey id check not subscriptions.subscriptionMapping.hasKey id
test "filter not found error recreates block filter":
let emptyHandler = proc(blck: Block) = discard
check subscriptions.subscriptionMapping.len == 0
let id = await subscriptions.subscribeBlocks(emptyHandler)
check subscriptions.subscriptionMapping[id] == id
mockServer.invalidateFilter(id)
check eventually subscriptions.subscriptionMapping[id] != id
test "recreated block filter can be still unsubscribed using the original id":
let emptyHandler = proc(blck: Block) = discard
let id = await subscriptions.subscribeBlocks(emptyHandler)
mockServer.invalidateFilter(id)
check eventually subscriptions.subscriptionMapping[id] != id
await subscriptions.unsubscribe(id)
check not subscriptions.subscriptionMapping.hasKey id