GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removal of missed unwrap()

Browse Source
This commit is contained in:
mfahampshire
2023-07-21 16:22:42 +02:00
parent 0103ae9b75
commit 1bee13a52d
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demos/rust-cosmos-broadcaster/bin/client.rs
+15 -13
View File
@@ -30,16 +30,16 @@ struct OfflineSignTx {
mnemonic: bip39::Mnemonic,
/// recipient nyx chain address for token transfer
nyx_token_receipient: AccountId,
/// the address of the broadcaster service - this submits txs and queries the chain on our behalf
sp_address: String
/// the address of the broadcaster service - this submits txs and queries the chain on our behalf
sp_address: String,
}
#[derive(Debug, Args)]
struct SendTx {
/// the base58 encoded signed payload created in OfflineSign()
base58_payload: String,
/// the address of the broadcaster service - this submits txs and queries the chain on our behalf
sp_address: String
/// the address of the broadcaster service - this submits txs and queries the chain on our behalf
sp_address: String,
}
#[tokio::main]
@@ -53,21 +53,21 @@ async fn main() -> anyhow::Result<()> {
Some(Commands::OfflineSignTx(OfflineSignTx {
mnemonic,
nyx_token_receipient,
sp_address
sp_address,
})) => {
println!("\nsending offline sign info to broadcaster via the mixnet: getting signing account sequence and chain ID");
let sp_address = Recipient::try_from_base58_string(sp_address).unwrap();
let sp_address = Recipient::try_from_base58_string(sp_address).unwrap();
let base58_tx_bytes = offline_sign(
mnemonic.clone(),
nyx_token_receipient.clone(),
&mut client,
sp_address,
)
.await;
.await?;
println!(
"Encoded response (signed tx data) as base58 for tx broadcast: \n\n{:?}\n",
&base58_tx_bytes.as_ref()
&base58_tx_bytes
);
println!("do you also wish to send the tx? y/n");
@@ -77,8 +77,7 @@ async fn main() -> anyhow::Result<()> {
if input.starts_with('y') {
println!("\nsending pre-signed tx through the mixnet to broadcaster service");
let (tx_hash, success) =
send_tx(base58_tx_bytes.unwrap(), sp_address, &mut client).await?;
let (tx_hash, success) = send_tx(base58_tx_bytes, sp_address, &mut client).await?;
println!(
"tx hash returned from the broadcaster: {}\ntx was successful: {}",
tx_hash, success
@@ -89,9 +88,12 @@ async fn main() -> anyhow::Result<()> {
println!("\nunrecognised user input");
}
}
Some(Commands::SendTx(SendTx { base58_payload, sp_address})) => {
let sp_address = Recipient::try_from_base58_string(sp_address).unwrap();
let tx_hash = send_tx(base58_payload.clone(), sp_address, &mut client).await;
Some(Commands::SendTx(SendTx {
base58_payload,
sp_address,
})) => {
let sp_address = Recipient::try_from_base58_string(sp_address).unwrap();
let tx_hash = send_tx(base58_payload.clone(), sp_address, &mut client).await?;
println!("response from the broadcaster (tx hash) {:#?}", tx_hash);
}
None => {
demos/rust-cosmos-broadcaster/src/client.rs
+3 -6
View File
@@ -30,9 +30,9 @@ pub async fn offline_sign(
signer_address: signer_address.clone(), // our (sender) address, derived from mnemonic
};
// send req to service via the mixnet
// send request to service via the mixnet
client
.send_str(sp_address, &serde_json::to_string(&message).unwrap())
.send_str(sp_address, &serde_json::to_string(&message)?)
.await;
// listen for response from service
@@ -101,10 +101,7 @@ pub async fn send_tx(
// send broadcast request containing base58 encoded signed tx to service via mixnet
client
.send_str(
sp_address,
&serde_json::to_string(&broadcast_request).unwrap(),
)
.send_str(sp_address, &serde_json::to_string(&broadcast_request)?)
.await;
println!("Waiting for reply");