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

Add slot context to rpc pubsub notifications (#9001)

Browse Source 
automerge
This commit is contained in:
Justin Starry
2020-03-23 20:34:42 +08:00
committed by GitHub
parent ca791a0378
commit 4b4819cd07
3 changed files with 114 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/tests/rpc.rs
View File

@ -7,7 +7,7 @@ use jsonrpc_core_client::transports::ws;
use log::*;
use reqwest::{self, header::CONTENT_TYPE};
use serde_json::{json, Value};
use solana_client::rpc_client::get_rpc_request_str;
use solana_client::{rpc_client::get_rpc_request_str, rpc_response::Response};
use solana_core::{rpc_pubsub::gen_client::Client as PubsubClient, validator::TestValidator};
use solana_sdk::{hash::Hash, pubkey::Pubkey, system_transaction, transaction};
use std::{
@ -217,7 +217,7 @@ fn test_rpc_subscriptions() {
// Create the pub sub runtime
let mut rt = Runtime::new().unwrap();
let rpc_pubsub_url = format!("ws://{}/", leader_data.rpc_pubsub);
let (sender, receiver) = channel::<(String, transaction::Result<()>)>();
let (sender, receiver) = channel::<(String, Response<transaction::Result<()>>)>();
let sender = Arc::new(Mutex::new(sender));
rt.spawn({
@ -253,7 +253,7 @@ fn test_rpc_subscriptions() {
assert!(now.elapsed().unwrap() < timeout);
match receiver.recv_timeout(Duration::from_secs(1)) {
Ok((sig, result)) => {
assert!(result.is_ok());
assert!(result.value.is_ok());
assert!(signature_set.remove(&sig));
}
Err(_err) => {