Skip to content

Commit

Permalink
Fix after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
stefan-mysten committed Dec 11, 2024
1 parent 29a09a7 commit fca6648
Showing 1 changed file with 5 additions and 19 deletions.
24 changes: 5 additions & 19 deletions crates/sui-graphql-client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1285,7 +1285,7 @@ impl Client {
let response = self.run_query(&operation).await?;

if let Some(errors) = response.errors {
return Err(Error::msg(format!("{:?}", errors)));
return Err(Error::graphql_error(errors));
}

if let Some(packages) = response.data {
Expand All @@ -1303,33 +1303,19 @@ impl Client {
let bcs = bcs
.as_ref()
.map(|b| base64ct::Base64::decode_vec(b.0.as_str()))
.transpose()
.map_err(|e| {
Error::msg(format!("Cannot decode Base64 package bcs bytes: {e}"))
})?;
.transpose()?;
let package = bcs
.map(|b| bcs::from_bytes::<MovePackage>(&b))
.transpose()
.map_err(|e| {
Error::msg(format!("Cannot decode bcs bytes into MovePackage: {e}"))
})?;
.transpose()?;

let effects = previous_transaction_block.and_then(|x| x.effects);
let effects = effects.and_then(|x| x.bcs);
let bcs = effects
.map(|x| base64ct::Base64::decode_vec(x.0.as_str()))
.transpose()
.map_err(|e| {
Error::msg(format!("Cannot decode Base64 effects bcs bytes: {e}"))
})?;
.transpose()?;
let effects = bcs
.map(|b| bcs::from_bytes::<TransactionEffects>(&b))
.transpose()
.map_err(|e| {
Error::msg(format!(
"Cannot decode bcs bytes into TransactionEffects: {e}"
))
})?;
.transpose()?;
let epoch = effects.map(|e| match e {
TransactionEffects::V1(e) => e.epoch,
TransactionEffects::V2(e) => e.epoch,
Expand Down

0 comments on commit fca6648

Please sign in to comment.