blockworks-foundation
/
solana-program-library
mirror of https://github.com/blockworks-foundation/solana-program-library.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

token-cli: let clients return signature or txn

This commit is contained in:
hanako mumei 2022-08-11 12:40:31 -07:00 committed by hana
parent c5caba0d63
commit 2ea6dfa1de
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
token/client/src/client.rs
View File

@ -62,8 +62,14 @@ pub trait SendTransactionRpc: SendTransaction {
#[derive(Debug, Clone, Copy, Default)] #[derive(Debug, Clone, Copy, Default)]
pub struct ProgramRpcClientSendTransaction; pub struct ProgramRpcClientSendTransaction;
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum RpcClientResponse {
Signature(Signature),
Transaction(Transaction),
}
impl SendTransaction for ProgramRpcClientSendTransaction { impl SendTransaction for ProgramRpcClientSendTransaction {
type Output = Signature; type Output = RpcClientResponse;
} }
impl SendTransactionRpc for ProgramRpcClientSendTransaction { impl SendTransactionRpc for ProgramRpcClientSendTransaction {
@ -76,12 +82,12 @@ impl SendTransactionRpc for ProgramRpcClientSendTransaction {
client client
.send_and_confirm_transaction(transaction) .send_and_confirm_transaction(transaction)
.await .await
.map(RpcClientResponse::Signature)
.map_err(Into::into) .map_err(Into::into)
}) })
} }
} }
//
pub type ProgramClientError = Box<dyn std::error::Error + Send + Sync>; pub type ProgramClientError = Box<dyn std::error::Error + Send + Sync>;
pub type ProgramClientResult<T> = Result<T, ProgramClientError>; pub type ProgramClientResult<T> = Result<T, ProgramClientError>;
@ -265,7 +271,7 @@ impl<ST> ProgramOfflineClient<ST> {
#[async_trait] #[async_trait]
impl<ST> ProgramClient<ST> for ProgramOfflineClient<ST> impl<ST> ProgramClient<ST> for ProgramOfflineClient<ST>
where where
ST: SendTransaction<Output = Signature> + Send + Sync, ST: SendTransaction<Output = RpcClientResponse> + Send + Sync,
{ {
async fn get_minimum_balance_for_rent_exemption( async fn get_minimum_balance_for_rent_exemption(
&self, &self,
@ -279,7 +285,7 @@ where
} }
async fn send_transaction(&self, transaction: &Transaction) -> ProgramClientResult<ST::Output> { async fn send_transaction(&self, transaction: &Transaction) -> ProgramClientResult<ST::Output> {
Ok(*transaction.signatures.first().expect("need a signature")) Ok(RpcClientResponse::Transaction(transaction.clone()))
} }
async fn get_account(&self, _address: Pubkey) -> ProgramClientResult<Option<Account>> { async fn get_account(&self, _address: Pubkey) -> ProgramClientResult<Option<Account>> {