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

rebase

Browse Source
This commit is contained in:
Michael Vines
2020-07-10 14:57:31 -07:00
parent 01987f8f89
commit 5a4a238029
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/rpc.rs
View File

@ -17,11 +17,7 @@ use jsonrpc_derive::rpc;
use solana_client::{ use solana_client::{
rpc_config::*, rpc_config::*,
rpc_request::{ rpc_request::{
<<<<<<< HEAD MAX_GET_CONFIRMED_BLOCKS_RANGE, MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS_SLOT_RANGE,
=======
DELINQUENT_VALIDATOR_SLOT_DISTANCE, MAX_GET_CONFIRMED_BLOCKS_RANGE,
>>>>>>> aef6bf272... getConfirmedBlocks now has an upper limit on slot range
MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS_SLOT_RANGE,
MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS, NUM_LARGEST_ACCOUNTS, MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS, NUM_LARGEST_ACCOUNTS,
}, },
rpc_response::*, rpc_response::*,
@ -3375,14 +3371,9 @@ pub mod tests {
let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap(); let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap();
assert_eq!(confirmed_blocks, vec![1, 3, 4]); assert_eq!(confirmed_blocks, vec![1, 3, 4]);
<<<<<<< HEAD
let req = let req =
format!(r#"{{"jsonrpc":"2.0","id":1,"method":"getConfirmedBlocks","params":[9, 11]}}"#); format!(r#"{{"jsonrpc":"2.0","id":1,"method":"getConfirmedBlocks","params":[9, 11]}}"#);
let res = io.handle_request_sync(&req, meta);
=======
let req = r#"{"jsonrpc":"2.0","id":1,"method":"getConfirmedBlocks","params":[9,11]}"#;
let res = io.handle_request_sync(&req, meta.clone()); let res = io.handle_request_sync(&req, meta.clone());
>>>>>>> aef6bf272... getConfirmedBlocks now has an upper limit on slot range
let result: Value = serde_json::from_str(&res.expect("actual response")) let result: Value = serde_json::from_str(&res.expect("actual response"))
.expect("actual response deserialization"); .expect("actual response deserialization");
let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap(); let confirmed_blocks: Vec<Slot> = serde_json::from_value(result["result"].clone()).unwrap();