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

move rpc types from client to client-types crate (#9039)

Browse Source 
* Separate client types into own crate, so ledger does not need it

Removes about 50 crates of dependency from ledger

* Drop Rpc name from transaction-status types
This commit is contained in:
sakridge
2020-03-26 13:29:30 -07:00
committed by GitHub
parent ed036b978d
commit b7b4aa5d4d
17 changed files with 241 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/rpc_client.rs
View File

@@ -23,6 +23,7 @@ use solana_sdk::{
signers::Signers,
transaction::{self, Transaction, TransactionError},
};
use solana_transaction_status::{ConfirmedBlock, TransactionEncoding, TransactionStatus};
use solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY;
use std::{
error,
@@ -119,7 +120,7 @@ impl RpcClient {
json!([[signature.to_string()], commitment_config]),
5,
)?;
let result: Vec<Option<RpcTransactionStatus>> =
let result: Vec<Option<TransactionStatus>> =
serde_json::from_value(signature_status).unwrap();
Ok(result[0].clone().map(|status_meta| status_meta.status))
}
@@ -185,15 +186,15 @@ impl RpcClient {
.map_err(|err| ClientError::new_with_command(err.into(), "GetClusterNodes"))
}
pub fn get_confirmed_block(&self, slot: Slot) -> ClientResult<RpcConfirmedBlock> {
self.get_confirmed_block_with_encoding(slot, RpcTransactionEncoding::Json)
pub fn get_confirmed_block(&self, slot: Slot) -> ClientResult<ConfirmedBlock> {
self.get_confirmed_block_with_encoding(slot, TransactionEncoding::Json)
}
pub fn get_confirmed_block_with_encoding(
&self,
slot: Slot,
encoding: RpcTransactionEncoding,
) -> ClientResult<RpcConfirmedBlock> {
encoding: TransactionEncoding,
) -> ClientResult<ConfirmedBlock> {
let response = self
.client
.send(&RpcRequest::GetConfirmedBlock, json!([slot, encoding]), 0)