diff --git a/crates/iota-graphql-rpc-client/src/response.rs b/crates/iota-graphql-rpc-client/src/response.rs index 2100a1aac94..40c24e93cf8 100644 --- a/crates/iota-graphql-rpc-client/src/response.rs +++ b/crates/iota-graphql-rpc-client/src/response.rs @@ -40,6 +40,7 @@ impl GraphqlResponse { }) } + #[allow(clippy::result_large_err)] pub fn graphql_version(&self) -> Result { Ok(self .headers @@ -90,6 +91,7 @@ impl GraphqlResponse { self.full_response.errors.clone() } + #[allow(clippy::result_large_err)] pub fn usage(&self) -> Result>, ClientError> { Ok(match self.full_response.extensions.get("usage").cloned() { Some(Value::Object(obj)) => Some( diff --git a/crates/iota-graphql-rpc-client/src/simple_client.rs b/crates/iota-graphql-rpc-client/src/simple_client.rs index 852ece48b8c..f78f8ca3753 100644 --- a/crates/iota-graphql-rpc-client/src/simple_client.rs +++ b/crates/iota-graphql-rpc-client/src/simple_client.rs @@ -117,7 +117,7 @@ impl SimpleClient { } } -#[allow(clippy::type_complexity)] +#[allow(clippy::type_complexity, clippy::result_large_err)] pub fn resolve_variables( vars: &[GraphqlQueryVariable], ) -> Result<(BTreeMap, BTreeMap), ClientError> { diff --git a/crates/iota-replay/src/data_fetcher.rs b/crates/iota-replay/src/data_fetcher.rs index 4bf7a73d398..70749a03dbe 100644 --- a/crates/iota-replay/src/data_fetcher.rs +++ b/crates/iota-replay/src/data_fetcher.rs @@ -522,7 +522,7 @@ impl DataFetcher for RemoteFetcher { u64::from_str(&w["reference_gas_price"].to_string().replace('\"', "")).unwrap() } else { return Err(ReplayEngineError::UnexpectedEventFormat { - event: event.clone(), + event: Box::new(event.clone()), }); }; @@ -639,7 +639,9 @@ pub fn extract_epoch_and_version(ev: IotaEvent) -> Result<(u64, u64), ReplayEngi return Ok((epoch, version)); } - Err(ReplayEngineError::UnexpectedEventFormat { event: ev }) + Err(ReplayEngineError::UnexpectedEventFormat { + event: Box::new(ev), + }) } #[derive(Clone)] diff --git a/crates/iota-replay/src/types.rs b/crates/iota-replay/src/types.rs index 993868020a6..05c90fffe71 100644 --- a/crates/iota-replay/src/types.rs +++ b/crates/iota-replay/src/types.rs @@ -166,7 +166,7 @@ pub enum ReplayEngineError { InvalidEpochChangeTx { epoch: u64 }, #[error("Unexpected event format {:#?}", event)] - UnexpectedEventFormat { event: IotaEvent }, + UnexpectedEventFormat { event: Box }, #[error("Unable to find event for epoch {epoch}")] EventNotFound { epoch: u64 }, diff --git a/crates/iota-source-validation/src/error.rs b/crates/iota-source-validation/src/error.rs index 36cb79955fb..c9060245b5e 100644 --- a/crates/iota-source-validation/src/error.rs +++ b/crates/iota-source-validation/src/error.rs @@ -49,8 +49,8 @@ pub enum Error { module: Symbol, }, - #[error("Dependency ID contains a Iota object, not a Move package: {0}")] - ObjectFoundWhenPackageExpected(ObjectID, IotaRawMoveObject), + #[error("Dependency ID contains a Iota object, not a Move package: {}", .0.0)] + ObjectFoundWhenPackageExpected(Box<(ObjectID, IotaRawMoveObject)>), #[error("Could not deserialize on-chain dependency {address}::{module}.")] OnChainDependencyDeserializationError { diff --git a/crates/iota-source-validation/src/lib.rs b/crates/iota-source-validation/src/lib.rs index 38009f1fe89..18a3942c7cc 100644 --- a/crates/iota-source-validation/src/lib.rs +++ b/crates/iota-source-validation/src/lib.rs @@ -414,9 +414,9 @@ impl<'a> BytecodeSourceVerifier<'a> { match obj { IotaRawData::Package(pkg) => Ok(pkg), - IotaRawData::MoveObject(move_obj) => { - Err(Error::ObjectFoundWhenPackageExpected(obj_id, move_obj)) - } + IotaRawData::MoveObject(move_obj) => Err(Error::ObjectFoundWhenPackageExpected( + Box::new((obj_id, move_obj)), + )), } } } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 4cef0b738ff..76fcadb5b32 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.81" +channel = "1.82" diff --git a/scripts/generate_files/Dockerfile b/scripts/generate_files/Dockerfile index 7b832715976..334aa855498 100644 --- a/scripts/generate_files/Dockerfile +++ b/scripts/generate_files/Dockerfile @@ -1,7 +1,7 @@ FROM node:20-bookworm # Accept a build argument for the Rust version -ARG RUST_VERSION=1.81 +ARG RUST_VERSION=1.82 # Get USER_ID from build-args ARG USER_ID=1000