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

Remove pubkey from getBalance response

Browse Source
This commit is contained in:
Michael Vines
2018-08-20 14:20:20 -07:00
committed by Grimes
parent b9ec97a30b
commit a02910be32
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/rpc.rs
View File

@ -74,7 +74,7 @@ build_rpc_trait! {
fn confirm_transaction(&self, Self::Metadata, String) -> Result<bool>; fn confirm_transaction(&self, Self::Metadata, String) -> Result<bool>;
#[rpc(meta, name = "getBalance")] #[rpc(meta, name = "getBalance")]
fn get_balance(&self, Self::Metadata, String) -> Result<(String, i64)>; fn get_balance(&self, Self::Metadata, String) -> Result<i64>;
#[rpc(meta, name = "getFinality")] #[rpc(meta, name = "getFinality")]
fn get_finality(&self, Self::Metadata) -> Result<usize>; fn get_finality(&self, Self::Metadata) -> Result<usize>;
@ -95,23 +95,19 @@ impl RpcSol for RpcSolImpl {
type Metadata = Meta; type Metadata = Meta;
fn confirm_transaction(&self, meta: Self::Metadata, id: String) -> Result<bool> { fn confirm_transaction(&self, meta: Self::Metadata, id: String) -> Result<bool> {
let signature_vec = match bs58::decode(id).into_vec() { let signature_vec = bs58::decode(id)
Ok(signature_vec) => signature_vec, .into_vec()
Err(_) => return Err(Error::invalid_request()), .map_err(|_| Error::invalid_request())?;
};
if signature_vec.len() != mem::size_of::<Signature>() { if signature_vec.len() != mem::size_of::<Signature>() {
return Err(Error::invalid_request()); return Err(Error::invalid_request());
} }
let signature = Signature::new(&signature_vec); let signature = Signature::new(&signature_vec);
meta.request_processor.get_signature_status(signature) meta.request_processor.get_signature_status(signature)
} }
fn get_balance(&self, meta: Self::Metadata, id: String) -> Result<(String, i64)> { fn get_balance(&self, meta: Self::Metadata, id: String) -> Result<i64> {
let pubkey_vec = match bs58::decode(id).into_vec() { let pubkey_vec = bs58::decode(id)
Ok(pubkey_vec) => pubkey_vec, .into_vec()
Err(_) => return Err(Error::invalid_request()), .map_err(|_| Error::invalid_request())?;
};
if pubkey_vec.len() != mem::size_of::<Pubkey>() { if pubkey_vec.len() != mem::size_of::<Pubkey>() {
return Err(Error::invalid_request()); return Err(Error::invalid_request());
} }
@ -157,9 +153,9 @@ impl JsonRpcRequestProcessor {
} }
/// Process JSON-RPC request items sent via JSON-RPC. /// Process JSON-RPC request items sent via JSON-RPC.
fn get_balance(&self, pubkey: Pubkey) -> Result<(String, i64)> { fn get_balance(&self, pubkey: Pubkey) -> Result<i64> {
let val = self.bank.get_balance(&pubkey); let val = self.bank.get_balance(&pubkey);
Ok((bs58::encode(pubkey).into_string(), val)) Ok(val)
} }
fn get_finality(&self) -> Result<usize> { fn get_finality(&self) -> Result<usize> {
Ok(self.bank.finality()) Ok(self.bank.finality())
@ -208,10 +204,7 @@ mod tests {
bob_pubkey bob_pubkey
); );
let res = io.handle_request_sync(&req, meta.clone()); let res = io.handle_request_sync(&req, meta.clone());
let expected = format!( let expected = format!(r#"{{"jsonrpc":"2.0","result":20,"id":1}}"#);
r#"{{"jsonrpc":"2.0","result":["{}", 20],"id":1}}"#,
bob_pubkey
);
let expected: Response = let expected: Response =
serde_json::from_str(&expected).expect("expected response deserialization"); serde_json::from_str(&expected).expect("expected response deserialization");