From 56f7ba7c735eea8f926bb71dbce9ee358276ad01 Mon Sep 17 00:00:00 2001
From: coffeepots <coffeepotsgh@gmail.com>
Date: Thu, 6 Dec 2018 21:26:53 +0000
Subject: [PATCH] Update signatures

---
 tests/rpcclient/ethcallsigs.nim | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/tests/rpcclient/ethcallsigs.nim b/tests/rpcclient/ethcallsigs.nim
index c508bf6e5..7632792ca 100644
--- a/tests/rpcclient/ethcallsigs.nim
+++ b/tests/rpcclient/ethcallsigs.nim
@@ -1,7 +1,7 @@
 ## This module contains signatures for the Ethereum client RPCs.
 ## The signatures are not imported directly, but read and processed with parseStmt,
 ## then a procedure body is generated to marshal native Nim parameters to json and visa versa.
-import json, stint, eth_common, ../../nimbus/rpc/hexstrings
+import json, stint, eth_common, ../../nimbus/rpc/hexstrings, ../../nimbus/rpc/rpc_types
 
 proc web3_clientVersion(): string
 proc web3_sha3(data: string): string
@@ -17,7 +17,7 @@ proc eth_gasPrice(): GasInt
 proc eth_accounts(): seq[EthAddressStr]
 proc eth_blockNumber(): BlockNumber
 proc eth_getBalance(data: EthAddressStr, quantityTag: string): UInt256
-proc eth_getStorageAt(data: EthAddressStr, quantity: int, quantityTag: string): seq[byte]
+proc eth_getStorageAt(data: EthAddressStr, quantity: int, quantityTag: string): string
 proc eth_getTransactionCount(data: EthAddressStr, quantityTag: string)
 proc eth_getBlockTransactionCountByHash(data: array[32, byte])
 proc eth_getBlockTransactionCountByNumber(quantityTag: string)
@@ -25,12 +25,10 @@ proc eth_getUncleCountByBlockHash(data: array[32, byte])
 proc eth_getUncleCountByBlockNumber(quantityTag: string)
 proc eth_getCode(data: EthAddressStr, quantityTag: string): HexDataStr
 proc eth_sign(data:EthAddressStr, message: HexDataStr): HexDataStr
-#proc eth_sendRawTransaction(data: string, quantityTag: int): UInt256
-proc eth_call(call: EthCall, quantityTag: string): string
-
-# TODO: Use eth_common types
-
-#[proc eth_sendTransaction(obj: EthSend): UInt256
+proc eth_sendRawTransaction(data: string, quantityTag: int): UInt256
+proc eth_call(call: EthCall, blockNum: string): string
+#[
+proc eth_sendTransaction(obj: EthSend): UInt256
 proc eth_estimateGas(call: EthCall, quantityTag: string): UInt256
 proc eth_getBlockByHash(data: array[32, byte], fullTransactions: bool): BlockObject
 proc eth_getBlockByNumber(quantityTag: string, fullTransactions: bool): BlockObject
@@ -43,25 +41,14 @@ proc eth_getUncleByBlockNumberAndIndex(quantityTag: string, quantity: int64): Bl
 proc eth_getCompilers(): seq[string]
 proc eth_compileLLL(): seq[byte]
 proc eth_compileSolidity(): seq[byte]
-proc eth_compileSerpent(): seq[byte]
 proc eth_newFilter(filterOptions: FilterOptions): int
 proc eth_newBlockFilter(): int
 proc eth_newPendingTransactionFilter(): int
 proc eth_uninstallFilter(filterId: int): bool
-proc eth_getFilterChanges(filterId: int): seq[LogObject]
-proc eth_getFilterLogs(filterId: int): seq[LogObject]
-proc eth_getLogs(filterOptions: FilterOptions): seq[LogObject]
+proc eth_getFilterChanges(filterId: int): seq[FilterLog]
+proc eth_getFilterLogs(filterId: int): seq[FilterLog]
+proc eth_getLogs(filterOptions: FilterOptions): seq[FilterLog]
 proc eth_getWork(): seq[UInt256]
 proc eth_submitWork(nonce: int64, powHash: Uint256, mixDigest: Uint256): bool
 proc eth_submitHashrate(hashRate: UInt256, id: Uint256): bool
-proc shh_post(): string
-proc shh_version(message: WhisperPost): bool
-proc shh_newIdentity(): array[60, byte]
-proc shh_hasIdentity(identity: array[60, byte]): bool
-proc shh_newGroup(): array[60, byte]
-proc shh_addToGroup(identity: array[60, byte]): bool
-proc shh_newFilter(filterOptions: FilterOptions, to: array[60, byte], topics: seq[UInt256]): int
-proc shh_uninstallFilter(id: int): bool
-proc shh_getFilterChanges(id: int): seq[WhisperMessage]
-proc shh_getMessages(id: int): seq[WhisperMessage]
 ]#
\ No newline at end of file