rename cfx_getTransactionCount to cfx_getNextNonce (#1139)

* rename cfx_getTransactionCount to cfx_getNextNonce

Author: resodo

.gitignore

@@ -6,6 +6,7 @@ target
 build/
 .*
 **/blockchain_db/
+**/sqlite_db/
 **/net_config/
 **/*.log
 **/testnet.toml

client/src/rpc/impls/alliance.rs

@@ -207,7 +207,7 @@ impl Cfx for CfxHandler {
         fn block_by_hash(&self, hash: RpcH256, include_txs: bool) -> RpcResult<Option<RpcBlock>>;
         fn epoch_number(&self, epoch_num: Option<EpochNumber>) -> RpcResult<RpcU256>;
         fn gas_price(&self) -> RpcResult<RpcU256>;
-        fn transaction_count(&self, address: RpcH160, num: Option<BlockHashOrEpochNumber>) -> RpcResult<RpcU256>;
+        fn next_nonce(&self, address: RpcH160, num: Option<BlockHashOrEpochNumber>) -> RpcResult<RpcU256>;
 
         fn admin(&self, address: RpcH160, num: Option<EpochNumber>) -> BoxFuture<RpcH160>;
         fn sponsor_info(&self, address: RpcH160, num: Option<EpochNumber>) -> BoxFuture<RpcSponsorInfo>;

client/src/rpc/impls/cfx.rs

@@ -359,7 +359,7 @@ impl RpcImpl {
 
         if tx.nonce.is_none() {
             let nonce = consensus_graph
-                .transaction_count(
+                .next_nonce(
                     tx.from.clone().into(),
                     BlockHashOrEpochNumber::EpochNumber(
                         EpochNumber::LatestState,
@@ -834,7 +834,7 @@ impl Cfx for CfxHandler {
             fn blocks_by_epoch(&self, num: EpochNumber) -> RpcResult<Vec<RpcH256>>;
             fn epoch_number(&self, epoch_num: Option<EpochNumber>) -> RpcResult<RpcU256>;
             fn gas_price(&self) -> RpcResult<RpcU256>;
-            fn transaction_count(&self, address: RpcH160, num: Option<BlockHashOrEpochNumber>) -> RpcResult<RpcU256>;
+            fn next_nonce(&self, address: RpcH160, num: Option<BlockHashOrEpochNumber>) -> RpcResult<RpcU256>;
         }
 
         target self.rpc_impl {

client/src/rpc/impls/common.rs

@@ -218,7 +218,7 @@ impl RpcImpl {
             .and_then(|vec| Ok(vec.into_iter().map(|x| x.into()).collect()))
     }
 
-    pub fn transaction_count(
+    pub fn next_nonce(
         &self, address: RpcH160, num: Option<BlockHashOrEpochNumber>,
     ) -> RpcResult<RpcU256> {
         let consensus_graph = self
@@ -230,12 +230,12 @@ impl RpcImpl {
             EpochNumber::LatestState,
         ));
         info!(
-            "RPC Request: cfx_getTransactionCount address={:?} epoch_num={:?}",
+            "RPC Request: cfx_getNextNonce address={:?} epoch_num={:?}",
             address, num
         );
 
         consensus_graph
-            .transaction_count(address.into(), num.into())
+            .next_nonce(address.into(), num.into())
             .map_err(RpcError::invalid_params)
             .map(|x| x.into())
     }

client/src/rpc/impls/light.rs

@@ -446,7 +446,7 @@ impl Cfx for CfxHandler {
             fn blocks_by_epoch(&self, num: EpochNumber) -> RpcResult<Vec<RpcH256>>;
             fn epoch_number(&self, epoch_num: Option<EpochNumber>) -> RpcResult<RpcU256>;
             fn gas_price(&self) -> RpcResult<RpcU256>;
-            fn transaction_count(&self, address: RpcH160, num: Option<BlockHashOrEpochNumber>) -> RpcResult<RpcU256>;
+            fn next_nonce(&self, address: RpcH160, num: Option<BlockHashOrEpochNumber>) -> RpcResult<RpcU256>;
         }
 
         target self.rpc_impl {

client/src/rpc/traits/cfx.rs

@@ -107,10 +107,10 @@ pub trait Cfx {
     #[rpc(name = "cfx_getBestBlockHash")]
     fn best_block_hash(&self) -> RpcResult<RpcH256>;
 
-    /// Returns the number of transactions sent from given address at given time
-    /// (epoch number).
-    #[rpc(name = "cfx_getTransactionCount")]
-    fn transaction_count(
+    /// Returns the nonce should be filled in next sending transaction from
+    /// given address at given time (epoch number).
+    #[rpc(name = "cfx_getNextNonce")]
+    fn next_nonce(
         &self, addr: RpcH160, epoch_number: Option<BlockHashOrEpochNumber>,
     ) -> RpcResult<RpcU256>;
 
@@ -124,16 +124,6 @@ pub trait Cfx {
     //        fn block_trasaction_count_by_number(&self, BlockNumber) ->
     // BoxFuture<Option<RpcU256>>;
 
-    //        /// Returns the number of uncles in a block with given hash.
-    //        #[rpc(name = "cfx_getUncleCountByBlockHash")]
-    //        fn block_uncles_count_by_hash(&self, RpcH256) ->
-    // BoxFuture<Option<RpcU256>>;
-
-    //        /// Returns the number of uncles in a block with given block
-    // number.        #[rpc(name = "cfx_getUnclesCountByBlockNumber")]
-    //        fn block_uncles_count_by_number(&self, BlockNumber) ->
-    // BoxFuture<Option<RpcU256>>;
-
     /// Sends signed transaction, returning its hash.
     #[rpc(name = "cfx_sendRawTransaction")]
     fn send_raw_transaction(&self, raw_tx: Bytes) -> RpcResult<RpcH256>;

core/src/alliance_tree_graph/consensus/mod.rs

@@ -426,7 +426,7 @@ impl TreeGraphConsensus {
         Some((results_with_epoch, address, state_root))
     }
 
-    pub fn transaction_count(
+    pub fn next_nonce(
         &self, address: Address,
         block_hash_or_epoch_number: BlockHashOrEpochNumber,
     ) -> Result<U256, String>

core/src/consensus/mod.rs

@@ -687,7 +687,7 @@ impl ConsensusGraph {
         }
     }
 
-    pub fn transaction_count(
+    pub fn next_nonce(
         &self, address: H160,
         block_hash_or_epoch_number: BlockHashOrEpochNumber,
     ) -> Result<U256, String>

run/throttling.toml

@@ -35,7 +35,7 @@ cfx_getBlockByHash="20,20,5,1,5"
 cfx_getBlockByHashWithPivotAssumption="20,20,5,1,5"
 cfx_getBlockByEpochNumber="20,20,5,1,5"
 cfx_getBestBlockHash="50,50,10,1,5"
-cfx_getTransactionCount="50,50,10,1,5"
+cfx_getNextNonce="50,50,10,1,5"
 cfx_sendRawTransaction="50,50,10,1,5"
 cfx_call="20,20,5,1,5"
 cfx_getLogs="20,20,5,1,5"

src/cli.yaml

@@ -342,7 +342,7 @@ subcommands:
                 about: Get nonce of specified account
                 args:
                     - rpc-method:
-                        default_value: cfx_getTransactionCount
+                        default_value: cfx_getNextNonce
                         hidden: true
                     - rpc-args:
                         multiple: true

tests/conflux/rpc.py

@@ -193,11 +193,11 @@ def get_admin(self, addr: str, epoch: str = None) -> str:
     ''' Ignore block_hash if epoch is not None '''
     def get_nonce(self, addr: str, epoch: str = None, block_hash: str = None) -> int:
         if epoch is None and block_hash is None:
-            return int(self.node.cfx_getTransactionCount(addr), 0)
+            return int(self.node.cfx_getNextNonce(addr), 0)
         elif epoch is None:
-            return int(self.node.cfx_getTransactionCount(addr, "hash:"+block_hash), 0)
+            return int(self.node.cfx_getNextNonce(addr, "hash:"+block_hash), 0)
         else:
-            return int(self.node.cfx_getTransactionCount(addr, epoch), 0)
+            return int(self.node.cfx_getNextNonce(addr, epoch), 0)
 
     def send_raw_tx(self, raw_tx: str) -> str:
         tx_hash = self.node.cfx_sendRawTransaction(raw_tx)

tests/test_framework/blocktools.py

@@ -95,7 +95,7 @@ def wait_for_initial_nonce_for_address(node, addr, timeout=10):
             raise AssertionError("Wait for initial nonce for address {} timeout after {} seconds, last exception is {}"
                                  .format(addr, timeout, last_exception))
         try:
-            nonce = int(node.cfx_getTransactionCount(addr), 0)
+            nonce = int(node.cfx_getNextNonce(addr), 0)
         except jsonrpcclient.exceptions.ReceivedErrorResponseError as e:
             # It's possible that
             last_exception = e