fix: modify unsubscribe cleanup routine and tests (#84)
* fix: modify unsubscribe cleanup routine
Ignore exceptions (other than CancelledError) if uninstallation of the filter fails. If it's the last step in the subscription cleanup, then filter changes for this filter will no longer be polled so if the filter continues to live on in geth for whatever reason, then it doesn't matter.
This includes a number of fixes:
- `CancelledError` is now caught inside of `getChanges`. This was causing conditions during `subscriptions.close`, where the `CancelledError` would get consumed by the `except CatchableError`, if there was an ongoing `poll` happening at the time of close.
- After creating a new filter inside of `getChanges`, the new filter is polled for changes before returning.
- `getChanges` also does not swallow `CatchableError` by returning an empty array, and instead re-raises the error if it is not `filter not found`.
- The tests were simplified by accessing the private fields of `PollingSubscriptions`. That way, there wasn't a race condition for the `newFilterId` counter inside of the mock.
- The `MockRpcHttpServer` was simplified by keeping track of the active filters only, and invalidation simply removes the filter. The tests then only needed to rely on the fact that the filter id changed in the mapping.
- Because of the above changes, we no longer needed to sleep inside of the tests, so the sleeps were removed, and the polling interval could be changed to 1ms, which not only makes the tests faster, but would further highlight any race conditions if present.
* docs: rpc custom port documentation
---------
Co-authored-by: Adam Uhlíř <adam@uhlir.dev>
2024-10-25 03:58:45 +00:00
|
|
|
import std/os
|
2022-06-09 13:30:34 +00:00
|
|
|
import pkg/asynctest
|
|
|
|
import pkg/ethers
|
Upgrade to `nim-json-rpc` v0.4.2 and chronos v4 (#64)
* Add json de/serialization lib from codex to handle conversions
json-rpc now requires nim-json-serialization to convert types to/from json. Use the nim-json-serialization signatures to call the json serialization lib from nim-codex (should be moved to its own lib)
* Add ethers implementation for setMethodHandler
Was removed in json-rpc
* More json conversion updates
* Fix json_rpc.call returning JsonString instead of JsonNode
* Update exceptions
Use {.async: (raises: [...].} where needed
Annotate provider with {.push raises:[].}
Format signatures
* Start fixing tests (mainly conversion fixes)
* rename sender to `from`, update json error logging, add more conversions
* Refactor exceptions for providers and signers, fix more tests
- signer procs raise SignerError, provider procs raise ProviderError
- WalletError now inherits from SignerError
- move wallet module under signers
- create jsonrpo moudle under signers
- bump nim-json-rpc for null-handling fixes
- All jsonrpc provider tests passing, still need to fix others
* remove raises from async annotation for dynamic dispatch
- removes async: raises from getAddress and signTransaction because derived JsonRpcSigner methods were not being used when dynamically dispatched. Once `raises` was removed from the async annotation, the dynamic dispatch worked again. This is only the case for getAddress and signTransaction.
- add gcsafe annotation to wallet.provider so that it matches the base method
* Catch EstimateGasError before ProviderError
EstimateGasError is now a ProviderError (it is a SignerError, and SignerError is a ProviderError), so EstimateGasErrors were not being caught
* clean up - all tests passing
* support nim 2.0
* lock in chronos version
* Add serde options to the json util, along with tests
next step is to:
1. change back any ethers var names that were changed for serialization purposes, eg `from` and `type`
2. move the json util to its own lib
* bump json-rpc to 0.4.0 and fix test
* fix: specify raises for getAddress and sendTransaction
Fixes issue where getAddress and sendTransaction could not be found for MockSigner in tests. The problem was that the async: raises update had not been applied to the MockSigner.
* handle exceptions during jsonrpc init
There are too many exceptions to catch individually, including chronos raising CatchableError exceptions in await expansion. There are also many other errors captured inside of the new proc with CatchableError. Instead of making it more complicated and harder to read, I think sticking with excepting CatchableError inside of convertError is a sensible solution
* cleanup
* deserialize key defaults to serialize key
* Add more tests for OptIn/OptOut/Strict modes, fix logic
* use nim-serde instead of json util
Allows aliasing of de/serialized fields, so revert changes of sender to `from` and transactionType to `type`
* Move hash* shim to its own module
* address PR feedback
- add comments to hashes shim
- remove .catch from callback condition
- derive SignerError from EthersError instead of ProviderError. This allows Providers and Signers to be separate, as Ledger does it, to isolate functionality. Some signer functions now raise both ProviderError and SignerError
- Update reverts to check for SignerError
- Update ERC-20 method comment
* rename subscriptions.init > subscriptions.start
2024-02-19 05:50:46 +00:00
|
|
|
import pkg/serde
|
2022-06-09 13:30:34 +00:00
|
|
|
import ./hardhat
|
|
|
|
|
|
|
|
type
|
|
|
|
TestReturns = ref object of Contract
|
|
|
|
Static = (UInt256, UInt256)
|
|
|
|
Dynamic = (string, UInt256)
|
|
|
|
|
|
|
|
suite "Contract return values":
|
|
|
|
|
|
|
|
var contract: TestReturns
|
|
|
|
var provider: JsonRpcProvider
|
|
|
|
var snapshot: JsonNode
|
fix: modify unsubscribe cleanup routine and tests (#84)
* fix: modify unsubscribe cleanup routine
Ignore exceptions (other than CancelledError) if uninstallation of the filter fails. If it's the last step in the subscription cleanup, then filter changes for this filter will no longer be polled so if the filter continues to live on in geth for whatever reason, then it doesn't matter.
This includes a number of fixes:
- `CancelledError` is now caught inside of `getChanges`. This was causing conditions during `subscriptions.close`, where the `CancelledError` would get consumed by the `except CatchableError`, if there was an ongoing `poll` happening at the time of close.
- After creating a new filter inside of `getChanges`, the new filter is polled for changes before returning.
- `getChanges` also does not swallow `CatchableError` by returning an empty array, and instead re-raises the error if it is not `filter not found`.
- The tests were simplified by accessing the private fields of `PollingSubscriptions`. That way, there wasn't a race condition for the `newFilterId` counter inside of the mock.
- The `MockRpcHttpServer` was simplified by keeping track of the active filters only, and invalidation simply removes the filter. The tests then only needed to rely on the fact that the filter id changed in the mapping.
- Because of the above changes, we no longer needed to sleep inside of the tests, so the sleeps were removed, and the polling interval could be changed to 1ms, which not only makes the tests faster, but would further highlight any race conditions if present.
* docs: rpc custom port documentation
---------
Co-authored-by: Adam Uhlíř <adam@uhlir.dev>
2024-10-25 03:58:45 +00:00
|
|
|
let providerUrl = getEnv("ETHERS_TEST_PROVIDER", "localhost:8545")
|
2022-06-09 13:30:34 +00:00
|
|
|
|
|
|
|
setup:
|
fix: modify unsubscribe cleanup routine and tests (#84)
* fix: modify unsubscribe cleanup routine
Ignore exceptions (other than CancelledError) if uninstallation of the filter fails. If it's the last step in the subscription cleanup, then filter changes for this filter will no longer be polled so if the filter continues to live on in geth for whatever reason, then it doesn't matter.
This includes a number of fixes:
- `CancelledError` is now caught inside of `getChanges`. This was causing conditions during `subscriptions.close`, where the `CancelledError` would get consumed by the `except CatchableError`, if there was an ongoing `poll` happening at the time of close.
- After creating a new filter inside of `getChanges`, the new filter is polled for changes before returning.
- `getChanges` also does not swallow `CatchableError` by returning an empty array, and instead re-raises the error if it is not `filter not found`.
- The tests were simplified by accessing the private fields of `PollingSubscriptions`. That way, there wasn't a race condition for the `newFilterId` counter inside of the mock.
- The `MockRpcHttpServer` was simplified by keeping track of the active filters only, and invalidation simply removes the filter. The tests then only needed to rely on the fact that the filter id changed in the mapping.
- Because of the above changes, we no longer needed to sleep inside of the tests, so the sleeps were removed, and the polling interval could be changed to 1ms, which not only makes the tests faster, but would further highlight any race conditions if present.
* docs: rpc custom port documentation
---------
Co-authored-by: Adam Uhlíř <adam@uhlir.dev>
2024-10-25 03:58:45 +00:00
|
|
|
provider = JsonRpcProvider.new("http://" & providerUrl)
|
2022-06-09 13:30:34 +00:00
|
|
|
snapshot = await provider.send("evm_snapshot")
|
|
|
|
let deployment = readDeployment()
|
|
|
|
contract = TestReturns.new(!deployment.address(TestReturns), provider)
|
|
|
|
|
|
|
|
teardown:
|
|
|
|
discard await provider.send("evm_revert", @[snapshot])
|
2023-06-27 14:40:29 +00:00
|
|
|
await provider.close()
|
2022-06-09 13:30:34 +00:00
|
|
|
|
|
|
|
test "handles static size structs":
|
|
|
|
proc getStatic(contract: TestReturns): Static {.contract, pure.}
|
|
|
|
proc getStatics(contract: TestReturns): (Static, Static) {.contract, pure.}
|
|
|
|
check (await contract.getStatic()) == (1.u256, 2.u256)
|
|
|
|
check (await contract.getStatics()) == ((1.u256, 2.u256), (3.u256, 4.u256))
|
|
|
|
|
|
|
|
test "handles dynamic size structs":
|
|
|
|
proc getDynamic(contract: TestReturns): Dynamic {.contract, pure.}
|
|
|
|
proc getDynamics(contract: TestReturns): (Dynamic, Dynamic) {.contract, pure.}
|
|
|
|
check (await contract.getDynamic()) == ("1", 2.u256)
|
|
|
|
check (await contract.getDynamics()) == (("1", 2.u256), ("3", 4.u256))
|
|
|
|
|
|
|
|
test "handles mixed dynamic and static size structs":
|
|
|
|
proc getDynamicAndStatic(contract: TestReturns): (Dynamic, Static) {.contract, pure.}
|
|
|
|
check (await contract.getDynamicAndStatic()) == (("1", 2.u256), (3.u256, 4.u256))
|
|
|
|
|
|
|
|
test "handles return type that is a tuple with a single element":
|
|
|
|
proc getDynamic(contract: TestReturns): (Dynamic,) {.contract, pure.}
|
|
|
|
check (await contract.getDynamic()) == (("1", 2.u256),)
|
|
|
|
|
|
|
|
test "handles parentheses around return type":
|
|
|
|
proc getDynamic(contract: TestReturns): (Dynamic) {.contract, pure.}
|
|
|
|
check (await contract.getDynamic()) == ("1", 2.u256)
|
|
|
|
|
|
|
|
test "handles return type that is an explicit tuple":
|
|
|
|
proc getDynamics(contract: TestReturns): tuple[a, b: Dynamic] {.contract, pure.}
|
|
|
|
let values = await contract.getDynamics()
|
|
|
|
check values.a == ("1", 2.u256)
|
|
|
|
check values.b == ("3", 4.u256)
|
2024-02-05 10:48:45 +00:00
|
|
|
|
|
|
|
test "handles static size struct as a public state variable":
|
|
|
|
proc staticVariable(contract: TestReturns): Static {.contract, getter.}
|
|
|
|
check (await contract.staticVariable()) == (1.u256, 2.u256)
|
|
|
|
|
|
|
|
test "handles dynamic size struct as a public state variable":
|
|
|
|
proc dynamicVariable(contract: TestReturns): Dynamic {.contract, getter.}
|
|
|
|
check (await contract.dynamicVariable()) == ("3", 4.u256)
|