Skip to content

Commit a059989

Browse files
AuHauAuHau
committed
debugging
1 parent 330fa8a commit a059989

12 files changed

+29
-12
lines changed

‎ethers/providers/jsonrpc/subscriptions.nim

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,14 @@ proc new*(_: type JsonRpcSubscriptions,
151151
proc getChanges(originalId: JsonNode): Future[JsonNode] {.async.} =
152152
try:
153153
let mappedId = subscriptions.subscriptionMapping[originalId]
154+
echo "getting changes for originalId: ", $originalId, "; mappedId: ", $mappedId
154155
return await subscriptions.client.eth_getFilterChanges(mappedId)
155156
except CatchableError as e:
156157
if "filter not found" in e.msg:
158+
echo "filter not found - recreating; originalId: ", originalId
157159
let filter = subscriptions.filters[originalId]
158160
let newId = await subscriptions.client.eth_newFilter(filter)
161+
echo "filter not found - newId: ", newId
159162
subscriptions.subscriptionMapping[originalId] = newId
160163

161164
return newJArray()
@@ -168,7 +171,9 @@ proc new*(_: type JsonRpcSubscriptions,
168171
proc poll {.async.} =
169172
untilCancelled:
170173
for id in toSeq subscriptions.callbacks.keys:
174+
echo "polling for key:", $id
171175
await poll(id)
176+
echo "sleeping"
172177
await sleepAsync(pollingInterval)
173178

174179
subscriptions.polling = poll()
@@ -221,6 +226,7 @@ method unsubscribe*(subscriptions: PollingSubscriptions,
221226
subscriptions.filters.del(id)
222227
subscriptions.callbacks.del(id)
223228
let sub = subscriptions.subscriptionMapping[id]
229+
echo "unsubscribing; originalId: ", $id, "; mappedId: ", $sub
224230
subscriptions.subscriptionMapping.del(id)
225231
try:
226232
discard await subscriptions.client.eth_uninstallFilter(sub)

‎testmodule/providers/jsonrpc/testJsonRpcProvider.nim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import std/os
12
import pkg/asynctest
23
import pkg/chronos
34
import pkg/ethers
@@ -6,7 +7,7 @@ import pkg/stew/byteutils
67
import ../../examples
78
import ../../miner
89

9-
for url in ["ws://localhost:8545", "http://localhost:8545"]:
10+
for url in ["ws://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545"), "http://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545")]:
1011

1112
suite "JsonRpcProvider (" & url & ")":
1213

‎testmodule/providers/jsonrpc/testJsonRpcSigner.nim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import std/os
12
import pkg/asynctest
23
import pkg/ethers
34
import pkg/stew/byteutils
@@ -9,7 +10,7 @@ suite "JsonRpcSigner":
910
var accounts: seq[Address]
1011

1112
setup:
12-
provider = JsonRpcProvider.new()
13+
provider = JsonRpcProvider.new("http://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545"))
1314
accounts = await provider.listAccounts()
1415

1516
teardown:

‎testmodule/providers/jsonrpc/testJsonRpcSubscriptions.nim

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import std/json
2+
import std/os
23
import std/sequtils
34
import pkg/asynctest
45
import pkg/serde
@@ -68,7 +69,7 @@ suite "Web socket subscriptions":
6869

6970
setup:
7071
client = newRpcWebSocketClient()
71-
await client.connect("ws://localhost:8545")
72+
await client.connect("ws://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545"))
7273
subscriptions = JsonRpcSubscriptions.new(client)
7374
subscriptions.start()
7475

@@ -85,7 +86,7 @@ suite "HTTP polling subscriptions":
8586

8687
setup:
8788
client = newRpcHttpClient()
88-
await client.connect("http://localhost:8545")
89+
await client.connect("http://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545"))
8990
subscriptions = JsonRpcSubscriptions.new(client,
9091
pollingInterval = 100.millis)
9192
subscriptions.start()

‎testmodule/testContracts.nim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import std/json
2+
import std/os
23
import std/options
34
import pkg/asynctest
45
import pkg/questionable
@@ -16,7 +17,7 @@ type
1617
method mint(token: TestToken, holder: Address, amount: UInt256): Confirmable {.base, contract.}
1718
method myBalance(token: TestToken): UInt256 {.base, contract, view.}
1819

19-
for url in ["ws://localhost:8545", "http://localhost:8545"]:
20+
for url in ["ws://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545"), "http://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545")]:
2021

2122
suite "Contracts (" & url & ")":
2223

‎testmodule/testCustomErrors.nim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import std/os
12
import std/json
23
import pkg/asynctest
34
import pkg/ethers
@@ -24,7 +25,7 @@ suite "Contract custom errors":
2425
var snapshot: JsonNode
2526

2627
setup:
27-
provider = JsonRpcProvider.new()
28+
provider = JsonRpcProvider.new("http://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545"))
2829
snapshot = await provider.send("evm_snapshot")
2930
let deployment = readDeployment()
3031
let address = !deployment.address(TestCustomErrors)

‎testmodule/testEnums.nim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import std/os
12
import pkg/asynctest
23
import pkg/ethers
34
import pkg/serde
@@ -16,7 +17,7 @@ suite "Contract enum parameters and return values":
1617
var snapshot: JsonNode
1718

1819
setup:
19-
provider = JsonRpcProvider.new()
20+
provider = JsonRpcProvider.new("http://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545"))
2021
snapshot = await provider.send("evm_snapshot")
2122
let deployment = readDeployment()
2223
contract = TestEnums.new(!deployment.address(TestEnums), provider)

‎testmodule/testErc20.nim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import std/os
12
import std/json
23
import pkg/asynctest
34
import pkg/questionable
@@ -11,7 +12,7 @@ type
1112

1213
method mint(token: TestToken, holder: Address, amount: UInt256): Confirmable {.base, contract.}
1314

14-
for url in ["ws://localhost:8545", "http://localhost:8545"]:
15+
for url in ["ws://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545"), "http://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545")]:
1516

1617
suite "ERC20 (" & url & ")":
1718

‎testmodule/testGasEstimation.nim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import std/os
12
import pkg/asynctest
23
import pkg/ethers
34
import pkg/serde
@@ -16,7 +17,7 @@ suite "gas estimation":
1617
var snapshot: JsonNode
1718

1819
setup:
19-
provider = JsonRpcProvider.new()
20+
provider = JsonRpcProvider.new("http://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545"))
2021
snapshot = await provider.send("evm_snapshot")
2122
let deployment = readDeployment()
2223
let signer = provider.getSigner()

‎testmodule/testReturns.nim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import std/os
12
import pkg/asynctest
23
import pkg/ethers
34
import pkg/serde
@@ -15,7 +16,7 @@ suite "Contract return values":
1516
var snapshot: JsonNode
1617

1718
setup:
18-
provider = JsonRpcProvider.new()
19+
provider = JsonRpcProvider.new("http://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545"))
1920
snapshot = await provider.send("evm_snapshot")
2021
let deployment = readDeployment()
2122
contract = TestReturns.new(!deployment.address(TestReturns), provider)

‎testmodule/testTesting.nim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import std/os
12
import std/strformat
23
import pkg/asynctest
34
import pkg/chronos
@@ -94,7 +95,7 @@ suite "Testing helpers - contracts":
9495
let revertReason = "revert reason"
9596

9697
setup:
97-
provider = JsonRpcProvider.new("ws://127.0.0.1:8545")
98+
provider = JsonRpcProvider.new("ws://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545"))
9899
snapshot = await provider.send("evm_snapshot")
99100
accounts = await provider.listAccounts()
100101
helpersContract = TestHelpers.new(provider.getSigner())

‎testmodule/testWallet.nim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import std/os
12
import pkg/asynctest
23
import pkg/serde
34
import pkg/stew/byteutils
@@ -14,7 +15,7 @@ suite "Wallet":
1415
var snapshot: JsonNode
1516

1617
setup:
17-
provider = JsonRpcProvider.new()
18+
provider = JsonRpcProvider.new("http://" & getEnv("ETHERS_TEST_PROVIDER", "localhost:8545"))
1819
snapshot = await provider.send("evm_snapshot")
1920

2021
teardown:

0 commit comments

Comments
 (0)