rebases fixes and nits

Author: chirag-parmar

nimbus_verified_proxy/json_rpc_backend.nim

@@ -127,20 +127,12 @@ proc getEthApiBackend*(client: JsonRpcClient): EthApiBackend =
         newestBlock: BlockTag,
         rewardPercentiles: Opt[seq[float64]],
     ): Future[FeeHistoryResult] {.async: (raises: [CancelledError]).} =
-      try:
-        await client.getClient().eth_feeHistory(
-          blockCount, newestBlock, rewardPercentiles
-        )
-      except CatchableError as e:
-        raise newException(CancelledError, e.msg)
+      handleBackendCall await client.getClient().eth_feeHistory(blockCount, newestBlock, rewardPercentiles)
 
     sendRawTxProc = proc(
         txBytes: seq[byte]
     ): Future[Hash32] {.async: (raises: [CancelledError]).} =
-      try:
-        await client.getClient().eth_sendRawTransaction(txBytes)
-      except CatchableError as e:
-        raise newException(CancelledError, e.msg)
+      handleBackendCall await client.getClient().eth_sendRawTransaction(txBytes)
 
   EthApiBackend(
     eth_chainId: ethChainIdProc,

nimbus_verified_proxy/json_rpc_frontend.nim

@@ -205,12 +205,14 @@ proc injectEngineFrontend*(server: JsonRpcServer, frontend: EthApiFrontend) =
   server.getServer().rpc("eth_sendRawTransaction") do(txBytes: seq[byte]) -> Hash32:
     await frontend.eth_sendRawTransaction(txBytes)
 
-proc stop*(server: JsonRpcServer) {.async: (raises: [EngineError]).} =
+proc stop*(server: JsonRpcServer) {.async: (raises: [CancelledError, EngineError]).} =
   try:
     case server.kind
     of Http:
       await server.httpServer.closeWait()
     of WebSocket:
       await server.wsServer.closeWait()
+  except CancelledError as e:
+    raise e
   except CatchableError as e:
     raise newException(EngineError, e.msg)