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

Revert signature-notification format change (#12032)

Browse Source 
* Use untagged RpcSignatureResult enum to avoid breaking downstream consumers of current signature subscriptions

* Clean up client duplication

* Clippy
This commit is contained in:
Tyera Eulberg
2020-09-03 18:14:45 -06:00
committed by GitHub
parent 2c091e4fca
commit 39246f9dd7
8 changed files with 56 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/tests/client.rs
View File

@ -1,7 +1,4 @@
use solana_client::{
pubsub_client::{PubsubClient, SlotInfoMessage},
rpc_client::RpcClient,
};
use solana_client::{pubsub_client::PubsubClient, rpc_client::RpcClient, rpc_response::SlotInfo};
use solana_core::{
rpc_pubsub_service::PubSubService, rpc_subscriptions::RpcSubscriptions,
validator::TestValidator,
@ -105,7 +102,7 @@ fn test_slot_subscription() {
let (mut client, receiver) =
PubsubClient::slot_subscribe(&format!("ws://0.0.0.0:{}/", pubsub_addr.port())).unwrap();
let mut errors: Vec<(SlotInfoMessage, SlotInfoMessage)> = Vec::new();
let mut errors: Vec<(SlotInfo, SlotInfo)> = Vec::new();
for i in 0..3 {
subscriptions.notify_slot(i + 1, i, i);
@ -114,7 +111,7 @@ fn test_slot_subscription() {
match maybe_actual {
Ok(actual) => {
let expected = SlotInfoMessage {
let expected = SlotInfo {
slot: i + 1,
parent: i,
root: i,

2
core/tests/rpc.rs
View File

@ -285,7 +285,7 @@ fn test_rpc_subscriptions() {
let timeout = deadline.saturating_duration_since(Instant::now());
match status_receiver.recv_timeout(timeout) {
Ok((sig, result)) => {
if let RpcSignatureResult::ProcessedSignatureResult(result) = result.value {
if let RpcSignatureResult::ProcessedSignature(result) = result.value {
assert!(result.err.is_none());
assert!(signature_set.remove(&sig));
} else {