refactor

Author: arnetheduck

web3.nim

@@ -102,43 +102,42 @@ proc onSubscription(w: Web3, subscription: string, params: JsonString) =
 func newWeb3*(provider: RpcClient): Web3 =
   result = Web3(provider: provider)
 
-  if provider of RpcConnection:
-    let provider = RpcConnection(provider)
-
-    let w3 = result
-    if provider.router == nil:
-      provider.router = RpcRouter.new()
-
-    provider.router[].rpc("eth_subscription") do(
-      subscription: string, params: JsonString
-    ) -> void:
-      w3.onSubscription(subscription, params)
-
 proc newWeb3*(
     uri: string,
     getHeaders: GetJsonRpcRequestHeaders = nil,
-    httpFlags: HttpClientFlags = {}):
-    Future[Web3] {.async.} =
+    httpFlags: HttpClientFlags = {},
+): Future[Web3] {.async.} =
   let u = parseUri(uri)
   var provider: RpcClient
   case u.scheme
   of "http", "https":
-    let p = newRpcHttpClient(getHeaders = getHeaders,
-                             flags = httpFlags)
+    let p = newRpcHttpClient(getHeaders = getHeaders, flags = httpFlags)
     await p.connect(uri)
-    provider = p
+
+    let w3 = newWeb3(p)
+    p.onDisconnect = proc() =
+      if not w3.onDisconnect.isNil:
+        w3.onDisconnect()
+    w3
   of "ws", "wss":
-    let p = newRpcWebSocketClient(getHeaders = getHeaders)
+    let router = RpcRouter.new()
+
+    let p = newRpcWebSocketClient(getHeaders = getHeaders, router = router)
     await p.connect(uri)
-    provider = p
+
+    let w3 = newWeb3(p)
+    router[].rpc("eth_subscription") do(
+      subscription: string, params: JsonString
+    ) -> void:
+      w3.onSubscription(subscription, params)
+
+    p.onDisconnect = proc() =
+      w3.subscriptions.clear()
+      if not w3.onDisconnect.isNil:
+        w3.onDisconnect()
+    w3
   else:
     raise newException(CatchableError, "Unknown web3 url scheme")
-  result = newWeb3(provider)
-  let r = result
-  provider.onDisconnect = proc() =
-    r.subscriptions.clear()
-    if not r.onDisconnect.isNil:
-      r.onDisconnect()
 
 proc close*(web3: Web3): Future[void] = web3.provider.close()