Revert signature-notification format change (bp #12032) (#12038)

* Revert signature-notification format change (#12032)

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

* Clean up client duplication

* Clippy

(cherry picked from commit 39246f9dd7)

# Conflicts:
#	core/src/rpc_pubsub.rs

* Fix conflicts

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>

core/src/rpc_subscriptions.rs

@@ -13,7 +13,8 @@ use solana_client::{
     rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig, RpcSignatureSubscribeConfig},
     rpc_filter::RpcFilterType,
     rpc_response::{
-        ProcessedSignatureResult, Response, RpcKeyedAccount, RpcResponseContext, RpcSignatureResult,
+        ProcessedSignatureResult, ReceivedSignatureResult, Response, RpcKeyedAccount,
+        RpcResponseContext, RpcSignatureResult, SlotInfo,
     },
 };
 use solana_runtime::{
@@ -47,13 +48,6 @@ use tokio_01::runtime::{Builder as RuntimeBuilder, Runtime, TaskExecutor};
 
 const RECEIVE_DELAY_MILLIS: u64 = 100;
 
-#[derive(Serialize, Deserialize, Clone, Copy, Debug)]
-pub struct SlotInfo {
-    pub slot: Slot,
-    pub parent: Slot,
-    pub root: Slot,
-}
-
 // A more human-friendly version of Vote, with the bank state signature base58 encoded.
 #[derive(Serialize, Deserialize, Debug)]
 pub struct RpcVote {
@@ -291,9 +285,7 @@ fn filter_signature_result(
 ) -> (Box<dyn Iterator<Item = RpcSignatureResult>>, Slot) {
     (
         Box::new(result.into_iter().map(|result| {
-            RpcSignatureResult::ProcessedSignatureResult(ProcessedSignatureResult {
-                err: result.err(),
-            })
+            RpcSignatureResult::ProcessedSignature(ProcessedSignatureResult { err: result.err() })
         })),
         last_notified_slot,
     )
@@ -986,7 +978,9 @@ impl RpcSubscriptions {
                                 context: RpcResponseContext {
                                     slot: *received_slot,
                                 },
-                                value: RpcSignatureResult::ReceivedSignature,
+                                value: RpcSignatureResult::ReceivedSignature(
+                                    ReceivedSignatureResult::ReceivedSignature,
+                                ),
                             },
                             &sink,
                         );
@@ -1371,8 +1365,9 @@ pub(crate) mod tests {
             .notify_signatures_received((received_slot, vec![unprocessed_tx.signatures[0]]));
         subscriptions.notify_subscribers(commitment_slots);
         let expected_res =
-            RpcSignatureResult::ProcessedSignatureResult(ProcessedSignatureResult { err: None });
-        let received_expected_res = RpcSignatureResult::ReceivedSignature;
+            RpcSignatureResult::ProcessedSignature(ProcessedSignatureResult { err: None });
+        let received_expected_res =
+            RpcSignatureResult::ReceivedSignature(ReceivedSignatureResult::ReceivedSignature);
         struct Notification {
             slot: Slot,
             id: u64,