Rename get_storage_mining_entry_height to get_storage_entry_height for consistency

This commit is contained in:
Michael Vines 2019-03-02 09:56:06 -08:00 committed by Greg Fitzgerald
parent 81cd461591
commit 642d3d903f
3 changed files with 8 additions and 8 deletions

View File

@ -343,7 +343,7 @@ impl Replicator {
.expect("rpc request")
.to_string();
let storage_entry_height = rpc_client
.make_rpc_request(2, RpcRequest::GetStorageMiningEntryHeight, None)
.make_rpc_request(2, RpcRequest::GetStorageEntryHeight, None)
.expect("rpc request")
.as_u64()
.unwrap();

View File

@ -77,7 +77,7 @@ impl JsonRpcRequestProcessor {
Ok(bs58::encode(hash).into_string())
}
fn get_storage_mining_entry_height(&self) -> Result<u64> {
fn get_storage_entry_height(&self) -> Result<u64> {
let entry_height = self.storage_state.get_entry_height();
Ok(entry_height)
}
@ -173,8 +173,8 @@ pub trait RpcSol {
#[rpc(meta, name = "getStorageBlockHash")]
fn get_storage_block_hash(&self, _: Self::Metadata) -> Result<String>;
#[rpc(meta, name = "getStorageMiningEntryHeight")]
fn get_storage_mining_entry_height(&self, _: Self::Metadata) -> Result<u64>;
#[rpc(meta, name = "getStorageEntryHeight")]
fn get_storage_entry_height(&self, _: Self::Metadata) -> Result<u64>;
#[rpc(meta, name = "getStoragePubkeysForEntryHeight")]
fn get_storage_pubkeys_for_entry_height(
@ -335,11 +335,11 @@ impl RpcSol for RpcSolImpl {
.get_storage_block_hash()
}
fn get_storage_mining_entry_height(&self, meta: Self::Metadata) -> Result<u64> {
fn get_storage_entry_height(&self, meta: Self::Metadata) -> Result<u64> {
meta.request_processor
.read()
.unwrap()
.get_storage_mining_entry_height()
.get_storage_entry_height()
}
fn get_storage_pubkeys_for_entry_height(

View File

@ -138,7 +138,7 @@ pub enum RpcRequest {
SignVote,
DeregisterNode,
GetStorageBlockHash,
GetStorageMiningEntryHeight,
GetStorageEntryHeight,
GetStoragePubkeysForEntryHeight,
}
@ -158,7 +158,7 @@ impl RpcRequest {
RpcRequest::SignVote => "signVote",
RpcRequest::DeregisterNode => "deregisterNode",
RpcRequest::GetStorageBlockHash => "getStorageBlockHash",
RpcRequest::GetStorageMiningEntryHeight => "getStorageMiningEntryHeight",
RpcRequest::GetStorageEntryHeight => "getStorageEntryHeight",
RpcRequest::GetStoragePubkeysForEntryHeight => "getStoragePubkeysForEntryHeight",
};
let mut request = json!({