gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename get_storage_mining_entry_height to get_storage_entry_height for consistency

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/replicator.rs
View File

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

10
core/src/rpc.rs
View File

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

4
core/src/rpc_request.rs
View File

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