Cleanup client traits and create super trait (#3728)

sdk/src/async_client.rs

@@ -1,35 +0,0 @@
-//! Defines a trait for non-blocking (asynchronous) communication with a Solana server.
-//! Implementations are expected to create tranasctions, sign them, and send
-//! them but without waiting to see if the server accepted it.
-
-use crate::instruction::Instruction;
-use crate::message::Message;
-use crate::pubkey::Pubkey;
-use crate::signature::{Keypair, Signature};
-use crate::transaction::Transaction;
-use std::io;
-
-pub trait AsyncClient {
-    /// Send a signed transaction, but don't wait to see if the server accepted it.
-    fn async_send_transaction(&self, transaction: Transaction) -> io::Result<Signature>;
-
-    /// Create a transaction from the given message, and send it to the
-    /// server, but don't wait for to see if the server accepted it.
-    fn async_send_message(&self, keypairs: &[&Keypair], message: Message) -> io::Result<Signature>;
-
-    /// Create a transaction from a single instruction that only requires
-    /// a single signer. Then send it to the server, but don't wait for a reply.
-    fn async_send_instruction(
-        &self,
-        keypair: &Keypair,
-        instruction: Instruction,
-    ) -> io::Result<Signature>;
-
-    /// Attempt to transfer lamports from `keypair` to `pubkey`, but don't wait to confirm.
-    fn async_transfer(
-        &self,
-        lamports: u64,
-        keypair: &Keypair,
-        pubkey: &Pubkey,
-    ) -> io::Result<Signature>;
-}

sdk/src/client.rs

@@ -0,0 +1,86 @@
+//! Defines traits for blocking (synchronous) and non-blocking (asynchronous)
+//! communication with a Solana server as well a a trait that encompasses both.
+//!
+//! //! Synchronous implementations are expected to create transactions, sign them, and send
+//! them with multiple retries, updating blockhashes and resigning as-needed.
+//!
+//! Asynchronous implementations are expected to create transactions, sign them, and send
+//! them but without waiting to see if the server accepted it.
+
+use crate::hash::Hash;
+use crate::instruction::Instruction;
+use crate::message::Message;
+use crate::pubkey::Pubkey;
+use crate::signature::{Keypair, Signature};
+use crate::transaction;
+use crate::transport::Result;
+use std::io;
+
+pub trait Client: SyncClient + AsyncClient {}
+
+pub trait SyncClient {
+    /// Create a transaction from the given message, and send it to the
+    /// server, retrying as-needed.
+    fn send_message(&self, keypairs: &[&Keypair], message: Message) -> Result<Signature>;
+
+    /// Create a transaction from a single instruction that only requires
+    /// a single signer. Then send it to the server, retrying as-needed.
+    fn send_instruction(&self, keypair: &Keypair, instruction: Instruction) -> Result<Signature>;
+
+    /// Transfer lamports from `keypair` to `pubkey`, retrying until the
+    /// transfer completes or produces and error.
+    fn transfer(&self, lamports: u64, keypair: &Keypair, pubkey: &Pubkey) -> Result<Signature>;
+
+    /// Get an account or None if not found.
+    fn get_account_data(&self, pubkey: &Pubkey) -> Result<Option<Vec<u8>>>;
+
+    /// Get account balance or 0 if not found.
+    fn get_balance(&self, pubkey: &Pubkey) -> Result<u64>;
+
+    /// Get signature status.
+    fn get_signature_status(
+        &self,
+        signature: &Signature,
+    ) -> Result<Option<transaction::Result<()>>>;
+
+    /// Get recent blockhash
+    fn get_recent_blockhash(&self) -> Result<Hash>;
+
+    /// Get transaction count
+    fn get_transaction_count(&self) -> Result<u64>;
+}
+
+pub trait AsyncClient {
+    /// Send a signed transaction, but don't wait to see if the server accepted it.
+    fn async_send_transaction(
+        &self,
+        transaction: transaction::Transaction,
+    ) -> io::Result<Signature>;
+
+    /// Create a transaction from the given message, and send it to the
+    /// server, but don't wait for to see if the server accepted it.
+    fn async_send_message(
+        &self,
+        keypairs: &[&Keypair],
+        message: Message,
+        recent_blockhash: Hash,
+    ) -> io::Result<Signature>;
+
+    /// Create a transaction from a single instruction that only requires
+    /// a single signer. Then send it to the server, but don't wait for a reply.
+    fn async_send_instruction(
+        &self,
+        keypair: &Keypair,
+        instruction: Instruction,
+        recent_blockhash: Hash,
+    ) -> io::Result<Signature>;
+
+    /// Attempt to transfer lamports from `keypair` to `pubkey`, but don't wait to confirm.
+    fn async_transfer(
+        &self,
+        lamports: u64,
+        keypair: &Keypair,
+        pubkey: &Pubkey,
+        recent_blockhash: Hash,
+    ) -> io::Result<Signature>;
+}

sdk/src/lib.rs

@@ -1,6 +1,6 @@
 pub mod account;
-pub mod async_client;
 pub mod bpf_loader;
+pub mod client;
 pub mod fee_calculator;
 pub mod genesis_block;
 pub mod hash;
@@ -14,7 +14,6 @@ pub mod pubkey;
 pub mod rpc_port;
 pub mod short_vec;
 pub mod signature;
-pub mod sync_client;
 pub mod system_instruction;
 pub mod system_program;
 pub mod system_transaction;

sdk/src/sync_client.rs

@@ -1,36 +0,0 @@
-//! Defines a trait for blocking (synchronous) communication with a Solana server.
-//! Implementations are expected to create tranasctions, sign them, and send
-//! them with multiple retries, updating blockhashes and resigning as-needed.
-
-use crate::instruction::Instruction;
-use crate::message::Message;
-use crate::pubkey::Pubkey;
-use crate::signature::{Keypair, Signature};
-use crate::transaction;
-use crate::transport::Result;
-
-pub trait SyncClient {
-    /// Create a transaction from the given message, and send it to the
-    /// server, retrying as-needed.
-    fn send_message(&self, keypairs: &[&Keypair], message: Message) -> Result<Signature>;
-
-    /// Create a transaction from a single instruction that only requires
-    /// a single signer. Then send it to the server, retrying as-needed.
-    fn send_instruction(&self, keypair: &Keypair, instruction: Instruction) -> Result<Signature>;
-
-    /// Transfer lamports from `keypair` to `pubkey`, retrying until the
-    /// transfer completes or produces and error.
-    fn transfer(&self, lamports: u64, keypair: &Keypair, pubkey: &Pubkey) -> Result<Signature>;
-
-    /// Get an account or None if not found.
-    fn get_account_data(&self, pubkey: &Pubkey) -> Result<Option<Vec<u8>>>;
-
-    /// Get account balance or 0 if not found.
-    fn get_balance(&self, pubkey: &Pubkey) -> Result<u64>;
-
-    /// Get signature status.
-    fn get_signature_status(
-        &self,
-        signature: &Signature,
-    ) -> Result<Option<transaction::Result<()>>>;
-}