From ae9365ea913be71a0f64a4f10d68c063e4fcb995 Mon Sep 17 00:00:00 2001 From: muXxer Date: Fri, 4 Oct 2024 18:13:45 +0200 Subject: [PATCH 1/8] chore: rustfmt --- crates/iota-rust-sdk/src/lib.rs | 2 +- crates/iota-rust-sdk/src/types/checkpoint.rs | 8 ++++---- crates/iota-rust-sdk/src/types/crypto/multisig.rs | 4 ++-- crates/iota-rust-sdk/src/types/crypto/zklogin.rs | 6 +----- crates/iota-rust-sdk/src/types/effects/v1.rs | 2 +- crates/iota-rust-sdk/src/types/effects/v2.rs | 2 +- .../iota-rust-sdk/src/types/transaction/serialization.rs | 8 ++++---- crates/iota-rust-sdk/src/types/transaction/unresolved.rs | 2 +- crates/iota-rust-sdk/src/types/type_tag/parse.rs | 2 +- crates/iota-rust-sdk/src/types/type_tag/serialization.rs | 4 ++-- rustfmt.toml | 9 +++++++++ 11 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 rustfmt.toml diff --git a/crates/iota-rust-sdk/src/lib.rs b/crates/iota-rust-sdk/src/lib.rs index 30bf517..71944cc 100644 --- a/crates/iota-rust-sdk/src/lib.rs +++ b/crates/iota-rust-sdk/src/lib.rs @@ -120,8 +120,8 @@ mod _serde { #[cfg(feature = "schemars")] mod _schemars { use schemars::{ - schema::{InstanceType, Metadata, SchemaObject}, JsonSchema, + schema::{InstanceType, Metadata, SchemaObject}, }; pub(crate) struct U64; diff --git a/crates/iota-rust-sdk/src/types/checkpoint.rs b/crates/iota-rust-sdk/src/types/checkpoint.rs index 2498ede..fc64a23 100644 --- a/crates/iota-rust-sdk/src/types/checkpoint.rs +++ b/crates/iota-rust-sdk/src/types/checkpoint.rs @@ -386,8 +386,8 @@ mod serialization { where S: Serializer, { - let mut seq = serializer.serialize_seq(Some(self.0 .0.len()))?; - for txn in &self.0 .0 { + let mut seq = serializer.serialize_seq(Some(self.0.0.len()))?; + for txn in &self.0.0 { let digests = Digests { transaction: &txn.transaction, effects: &txn.effects, @@ -404,8 +404,8 @@ mod serialization { where S: Serializer, { - let mut seq = serializer.serialize_seq(Some(self.0 .0.len()))?; - for txn in &self.0 .0 { + let mut seq = serializer.serialize_seq(Some(self.0.0.len()))?; + for txn in &self.0.0 { seq.serialize_element(&txn.signatures)?; } seq.end() diff --git a/crates/iota-rust-sdk/src/types/crypto/multisig.rs b/crates/iota-rust-sdk/src/types/crypto/multisig.rs index e43b0eb..90086a9 100644 --- a/crates/iota-rust-sdk/src/types/crypto/multisig.rs +++ b/crates/iota-rust-sdk/src/types/crypto/multisig.rs @@ -1,7 +1,7 @@ use super::{ - zklogin::{ZkLoginAuthenticator, ZkLoginPublicIdentifier}, Ed25519PublicKey, Ed25519Signature, Secp256k1PublicKey, Secp256k1Signature, Secp256r1PublicKey, Secp256r1Signature, SignatureScheme, + zklogin::{ZkLoginAuthenticator, ZkLoginPublicIdentifier}, }; pub type WeightUnit = u8; @@ -166,8 +166,8 @@ mod serialization { use super::*; use crate::types::{ - crypto::{Base64Array33, Base64Array34}, Ed25519PublicKey, Secp256k1PublicKey, Secp256r1PublicKey, SignatureScheme, + crypto::{Base64Array33, Base64Array34}, }; pub struct Base64MultisigMemberPublicKey; diff --git a/crates/iota-rust-sdk/src/types/crypto/zklogin.rs b/crates/iota-rust-sdk/src/types/crypto/zklogin.rs index 826c683..35b4e67 100644 --- a/crates/iota-rust-sdk/src/types/crypto/zklogin.rs +++ b/crates/iota-rust-sdk/src/types/crypto/zklogin.rs @@ -159,11 +159,7 @@ impl Bn254FieldElement { } // If the value is '0' then just return a slice of length 1 of the final byte - if buf.is_empty() { - &self.0[31..] - } else { - buf - } + if buf.is_empty() { &self.0[31..] } else { buf } } pub fn padded(&self) -> &[u8] { diff --git a/crates/iota-rust-sdk/src/types/effects/v1.rs b/crates/iota-rust-sdk/src/types/effects/v1.rs index 569ea82..16274fa 100644 --- a/crates/iota-rust-sdk/src/types/effects/v1.rs +++ b/crates/iota-rust-sdk/src/types/effects/v1.rs @@ -1,7 +1,7 @@ use crate::types::{ + EpochId, GasCostSummary, ObjectId, ObjectReference, TransactionDigest, TransactionEventsDigest, execution_status::ExecutionStatus, object::{Owner, Version}, - EpochId, GasCostSummary, ObjectId, ObjectReference, TransactionDigest, TransactionEventsDigest, }; /// The response from processing a transaction or a certified transaction diff --git a/crates/iota-rust-sdk/src/types/effects/v2.rs b/crates/iota-rust-sdk/src/types/effects/v2.rs index 2e4faa6..d8ae5a1 100644 --- a/crates/iota-rust-sdk/src/types/effects/v2.rs +++ b/crates/iota-rust-sdk/src/types/effects/v2.rs @@ -1,8 +1,8 @@ use crate::types::{ + EpochId, GasCostSummary, ObjectDigest, ObjectId, TransactionDigest, TransactionEventsDigest, digest::EffectsAuxiliaryDataDigest, execution_status::ExecutionStatus, object::{Owner, Version}, - EpochId, GasCostSummary, ObjectDigest, ObjectId, TransactionDigest, TransactionEventsDigest, }; /// The response from processing a transaction or a certified transaction diff --git a/crates/iota-rust-sdk/src/types/transaction/serialization.rs b/crates/iota-rust-sdk/src/types/transaction/serialization.rs index 95e7f0b..f6e9e7e 100644 --- a/crates/iota-rust-sdk/src/types/transaction/serialization.rs +++ b/crates/iota-rust-sdk/src/types/transaction/serialization.rs @@ -7,8 +7,8 @@ use crate::types::{ObjectId, ObjectReference}; mod transaction { use super::*; use crate::types::{ - transaction::{GasPayment, Transaction, TransactionExpiration, TransactionKind}, Address, + transaction::{GasPayment, Transaction, TransactionExpiration, TransactionKind}, }; #[derive(serde_derive::Serialize)] @@ -321,8 +321,8 @@ mod transaction_kind { mod end_of_epoch { use super::*; use crate::types::{ - transaction::{AuthenticatorStateExpire, ChangeEpoch, EndOfEpochTransactionKind}, CheckpointDigest, + transaction::{AuthenticatorStateExpire, ChangeEpoch, EndOfEpochTransactionKind}, }; #[derive(serde_derive::Serialize)] @@ -967,8 +967,8 @@ mod signed_transaction { use super::*; use crate::types::{ - transaction::{SignedTransaction, Transaction}, UserSignature, + transaction::{SignedTransaction, Transaction}, }; /// Intents are defined as: @@ -1235,8 +1235,8 @@ mod test { use wasm_bindgen_test::wasm_bindgen_test as test; use crate::types::{ - transaction::{Argument, InputArgument, Transaction}, ObjectDigest, ObjectId, ObjectReference, + transaction::{Argument, InputArgument, Transaction}, }; #[test] diff --git a/crates/iota-rust-sdk/src/types/transaction/unresolved.rs b/crates/iota-rust-sdk/src/types/transaction/unresolved.rs index e20bdf1..c1c1200 100644 --- a/crates/iota-rust-sdk/src/types/transaction/unresolved.rs +++ b/crates/iota-rust-sdk/src/types/transaction/unresolved.rs @@ -1,5 +1,5 @@ use super::{Command, TransactionExpiration}; -use crate::types::{object::Version, Address, ObjectDigest, ObjectId}; +use crate::types::{Address, ObjectDigest, ObjectId, object::Version}; // A potentially Unresolved user transaction #[cfg_attr( diff --git a/crates/iota-rust-sdk/src/types/type_tag/parse.rs b/crates/iota-rust-sdk/src/types/type_tag/parse.rs index 354693d..c558603 100644 --- a/crates/iota-rust-sdk/src/types/type_tag/parse.rs +++ b/crates/iota-rust-sdk/src/types/type_tag/parse.rs @@ -1,9 +1,9 @@ use winnow::{ + PResult, Parser, ascii::space0, combinator::{alt, delimited, eof, opt, separated}, stream::AsChar, token::{one_of, take_while}, - PResult, Parser, }; use super::{Address, Identifier, StructTag, TypeTag}; diff --git a/crates/iota-rust-sdk/src/types/type_tag/serialization.rs b/crates/iota-rust-sdk/src/types/type_tag/serialization.rs index eded71b..f2a72dd 100644 --- a/crates/iota-rust-sdk/src/types/type_tag/serialization.rs +++ b/crates/iota-rust-sdk/src/types/type_tag/serialization.rs @@ -1,4 +1,4 @@ -use serde::{de::Visitor, Deserialize, Deserializer, Serialize, Serializer}; +use serde::{Deserialize, Deserializer, Serialize, Serializer, de::Visitor}; use serde_with::{DeserializeAs, SerializeAs}; use super::*; @@ -243,8 +243,8 @@ impl<'de> Deserialize<'de> for StructTag { #[cfg(feature = "schemars")] mod json_schema { use schemars::{ - schema::{InstanceType, Metadata, SchemaObject, StringValidation}, JsonSchema, + schema::{InstanceType, Metadata, SchemaObject, StringValidation}, }; use super::*; diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..38d99e3 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,9 @@ +edition = "2021" +style_edition = "2024" +format_code_in_doc_comments = true +group_imports = "StdExternalCrate" +imports_granularity = "Crate" +normalize_comments = true +normalize_doc_attributes = true +wrap_comments = true +ignore = ["external-crates"] \ No newline at end of file From e8f88e7de43e3db1c2c329ded372b7f701096c02 Mon Sep 17 00:00:00 2001 From: muXxer Date: Fri, 4 Oct 2024 18:19:10 +0200 Subject: [PATCH 2/8] chore: add dprint config --- dprint.json | 23 +++++++++++++++++++++++ rustfmt.toml | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 dprint.json diff --git a/dprint.json b/dprint.json new file mode 100644 index 0000000..f18a8fe --- /dev/null +++ b/dprint.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://dprint.dev/schemas/v0.json", + "incremental": true, + "includes": [ + "**/*.{toml}", + "**/*.{md}", + "**/*.{yml,yaml}" + ], + "excludes": [ + "**/CHANGELOG.md", + "**/target/", + "**/build/", + "**/pnpm-lock.yaml", + ], + "toml": { + "lineWidth": 80 + }, + "plugins": [ + "https://plugins.dprint.dev/toml-0.6.2.wasm", + "https://plugins.dprint.dev/markdown-0.17.1.wasm", + "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.4.0.wasm" + ] +} \ No newline at end of file diff --git a/rustfmt.toml b/rustfmt.toml index 38d99e3..a2c0b3a 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -6,4 +6,4 @@ imports_granularity = "Crate" normalize_comments = true normalize_doc_attributes = true wrap_comments = true -ignore = ["external-crates"] \ No newline at end of file +ignore = ["external-crates"] From afcb1ce9fe9b37a15a67861f544a9a0aff9369a1 Mon Sep 17 00:00:00 2001 From: Chloe Martin Date: Mon, 7 Oct 2024 11:14:38 -0400 Subject: [PATCH 3/8] Format with nightly --- crates/iota-rust-sdk/src/lib.rs | 2 +- crates/iota-rust-sdk/src/types/checkpoint.rs | 8 ++++---- crates/iota-rust-sdk/src/types/crypto/multisig.rs | 4 ++-- crates/iota-rust-sdk/src/types/crypto/zklogin.rs | 6 +++++- crates/iota-rust-sdk/src/types/effects/v1.rs | 2 +- crates/iota-rust-sdk/src/types/effects/v2.rs | 2 +- .../iota-rust-sdk/src/types/transaction/serialization.rs | 8 ++++---- crates/iota-rust-sdk/src/types/transaction/unresolved.rs | 2 +- crates/iota-rust-sdk/src/types/type_tag/parse.rs | 2 +- crates/iota-rust-sdk/src/types/type_tag/serialization.rs | 4 ++-- 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/crates/iota-rust-sdk/src/lib.rs b/crates/iota-rust-sdk/src/lib.rs index 71944cc..30bf517 100644 --- a/crates/iota-rust-sdk/src/lib.rs +++ b/crates/iota-rust-sdk/src/lib.rs @@ -120,8 +120,8 @@ mod _serde { #[cfg(feature = "schemars")] mod _schemars { use schemars::{ - JsonSchema, schema::{InstanceType, Metadata, SchemaObject}, + JsonSchema, }; pub(crate) struct U64; diff --git a/crates/iota-rust-sdk/src/types/checkpoint.rs b/crates/iota-rust-sdk/src/types/checkpoint.rs index fc64a23..2498ede 100644 --- a/crates/iota-rust-sdk/src/types/checkpoint.rs +++ b/crates/iota-rust-sdk/src/types/checkpoint.rs @@ -386,8 +386,8 @@ mod serialization { where S: Serializer, { - let mut seq = serializer.serialize_seq(Some(self.0.0.len()))?; - for txn in &self.0.0 { + let mut seq = serializer.serialize_seq(Some(self.0 .0.len()))?; + for txn in &self.0 .0 { let digests = Digests { transaction: &txn.transaction, effects: &txn.effects, @@ -404,8 +404,8 @@ mod serialization { where S: Serializer, { - let mut seq = serializer.serialize_seq(Some(self.0.0.len()))?; - for txn in &self.0.0 { + let mut seq = serializer.serialize_seq(Some(self.0 .0.len()))?; + for txn in &self.0 .0 { seq.serialize_element(&txn.signatures)?; } seq.end() diff --git a/crates/iota-rust-sdk/src/types/crypto/multisig.rs b/crates/iota-rust-sdk/src/types/crypto/multisig.rs index 90086a9..e43b0eb 100644 --- a/crates/iota-rust-sdk/src/types/crypto/multisig.rs +++ b/crates/iota-rust-sdk/src/types/crypto/multisig.rs @@ -1,7 +1,7 @@ use super::{ + zklogin::{ZkLoginAuthenticator, ZkLoginPublicIdentifier}, Ed25519PublicKey, Ed25519Signature, Secp256k1PublicKey, Secp256k1Signature, Secp256r1PublicKey, Secp256r1Signature, SignatureScheme, - zklogin::{ZkLoginAuthenticator, ZkLoginPublicIdentifier}, }; pub type WeightUnit = u8; @@ -166,8 +166,8 @@ mod serialization { use super::*; use crate::types::{ - Ed25519PublicKey, Secp256k1PublicKey, Secp256r1PublicKey, SignatureScheme, crypto::{Base64Array33, Base64Array34}, + Ed25519PublicKey, Secp256k1PublicKey, Secp256r1PublicKey, SignatureScheme, }; pub struct Base64MultisigMemberPublicKey; diff --git a/crates/iota-rust-sdk/src/types/crypto/zklogin.rs b/crates/iota-rust-sdk/src/types/crypto/zklogin.rs index 35b4e67..826c683 100644 --- a/crates/iota-rust-sdk/src/types/crypto/zklogin.rs +++ b/crates/iota-rust-sdk/src/types/crypto/zklogin.rs @@ -159,7 +159,11 @@ impl Bn254FieldElement { } // If the value is '0' then just return a slice of length 1 of the final byte - if buf.is_empty() { &self.0[31..] } else { buf } + if buf.is_empty() { + &self.0[31..] + } else { + buf + } } pub fn padded(&self) -> &[u8] { diff --git a/crates/iota-rust-sdk/src/types/effects/v1.rs b/crates/iota-rust-sdk/src/types/effects/v1.rs index 16274fa..569ea82 100644 --- a/crates/iota-rust-sdk/src/types/effects/v1.rs +++ b/crates/iota-rust-sdk/src/types/effects/v1.rs @@ -1,7 +1,7 @@ use crate::types::{ - EpochId, GasCostSummary, ObjectId, ObjectReference, TransactionDigest, TransactionEventsDigest, execution_status::ExecutionStatus, object::{Owner, Version}, + EpochId, GasCostSummary, ObjectId, ObjectReference, TransactionDigest, TransactionEventsDigest, }; /// The response from processing a transaction or a certified transaction diff --git a/crates/iota-rust-sdk/src/types/effects/v2.rs b/crates/iota-rust-sdk/src/types/effects/v2.rs index d8ae5a1..2e4faa6 100644 --- a/crates/iota-rust-sdk/src/types/effects/v2.rs +++ b/crates/iota-rust-sdk/src/types/effects/v2.rs @@ -1,8 +1,8 @@ use crate::types::{ - EpochId, GasCostSummary, ObjectDigest, ObjectId, TransactionDigest, TransactionEventsDigest, digest::EffectsAuxiliaryDataDigest, execution_status::ExecutionStatus, object::{Owner, Version}, + EpochId, GasCostSummary, ObjectDigest, ObjectId, TransactionDigest, TransactionEventsDigest, }; /// The response from processing a transaction or a certified transaction diff --git a/crates/iota-rust-sdk/src/types/transaction/serialization.rs b/crates/iota-rust-sdk/src/types/transaction/serialization.rs index f6e9e7e..95e7f0b 100644 --- a/crates/iota-rust-sdk/src/types/transaction/serialization.rs +++ b/crates/iota-rust-sdk/src/types/transaction/serialization.rs @@ -7,8 +7,8 @@ use crate::types::{ObjectId, ObjectReference}; mod transaction { use super::*; use crate::types::{ - Address, transaction::{GasPayment, Transaction, TransactionExpiration, TransactionKind}, + Address, }; #[derive(serde_derive::Serialize)] @@ -321,8 +321,8 @@ mod transaction_kind { mod end_of_epoch { use super::*; use crate::types::{ - CheckpointDigest, transaction::{AuthenticatorStateExpire, ChangeEpoch, EndOfEpochTransactionKind}, + CheckpointDigest, }; #[derive(serde_derive::Serialize)] @@ -967,8 +967,8 @@ mod signed_transaction { use super::*; use crate::types::{ - UserSignature, transaction::{SignedTransaction, Transaction}, + UserSignature, }; /// Intents are defined as: @@ -1235,8 +1235,8 @@ mod test { use wasm_bindgen_test::wasm_bindgen_test as test; use crate::types::{ - ObjectDigest, ObjectId, ObjectReference, transaction::{Argument, InputArgument, Transaction}, + ObjectDigest, ObjectId, ObjectReference, }; #[test] diff --git a/crates/iota-rust-sdk/src/types/transaction/unresolved.rs b/crates/iota-rust-sdk/src/types/transaction/unresolved.rs index c1c1200..e20bdf1 100644 --- a/crates/iota-rust-sdk/src/types/transaction/unresolved.rs +++ b/crates/iota-rust-sdk/src/types/transaction/unresolved.rs @@ -1,5 +1,5 @@ use super::{Command, TransactionExpiration}; -use crate::types::{Address, ObjectDigest, ObjectId, object::Version}; +use crate::types::{object::Version, Address, ObjectDigest, ObjectId}; // A potentially Unresolved user transaction #[cfg_attr( diff --git a/crates/iota-rust-sdk/src/types/type_tag/parse.rs b/crates/iota-rust-sdk/src/types/type_tag/parse.rs index c558603..354693d 100644 --- a/crates/iota-rust-sdk/src/types/type_tag/parse.rs +++ b/crates/iota-rust-sdk/src/types/type_tag/parse.rs @@ -1,9 +1,9 @@ use winnow::{ - PResult, Parser, ascii::space0, combinator::{alt, delimited, eof, opt, separated}, stream::AsChar, token::{one_of, take_while}, + PResult, Parser, }; use super::{Address, Identifier, StructTag, TypeTag}; diff --git a/crates/iota-rust-sdk/src/types/type_tag/serialization.rs b/crates/iota-rust-sdk/src/types/type_tag/serialization.rs index f2a72dd..eded71b 100644 --- a/crates/iota-rust-sdk/src/types/type_tag/serialization.rs +++ b/crates/iota-rust-sdk/src/types/type_tag/serialization.rs @@ -1,4 +1,4 @@ -use serde::{Deserialize, Deserializer, Serialize, Serializer, de::Visitor}; +use serde::{de::Visitor, Deserialize, Deserializer, Serialize, Serializer}; use serde_with::{DeserializeAs, SerializeAs}; use super::*; @@ -243,8 +243,8 @@ impl<'de> Deserialize<'de> for StructTag { #[cfg(feature = "schemars")] mod json_schema { use schemars::{ - JsonSchema, schema::{InstanceType, Metadata, SchemaObject, StringValidation}, + JsonSchema, }; use super::*; From ab73962dbe28f48440d40d7f8e3652729e62be01 Mon Sep 17 00:00:00 2001 From: Chloe Martin Date: Mon, 7 Oct 2024 12:31:07 -0400 Subject: [PATCH 4/8] fix CI --- .github/workflows/ci.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d4e8aa..c631552 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,21 +25,26 @@ jobs: rustc --version cargo --version - - uses: taiki-e/install-action@cargo-hack - uses: taiki-e/install-action@cargo-nextest + - name: Run tests + run: make test + + lint: + runs-on: ubuntu-latest + + steps: + - uses: taiki-e/install-action@cargo-hack + - name: feature compatibility run: make check-features - name: rustfmt - run: cargo fmt -- --check + run: cargo +nightly fmt -- --check - name: clippy run: make clippy - - name: Run tests - run: make test - - name: rustdoc run: make doc From 26ee12fcb262f86125adbe0d0858bf1f1b765fdd Mon Sep 17 00:00:00 2001 From: Chloe Martin Date: Mon, 7 Oct 2024 12:42:05 -0400 Subject: [PATCH 5/8] checkout --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c631552..791d3ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,9 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout repository + uses: actions/checkout@v4 + - uses: taiki-e/install-action@cargo-hack - name: feature compatibility From d839b09e9cc6c076c94d4fc57a515f12dd2906d9 Mon Sep 17 00:00:00 2001 From: Chloe Martin Date: Mon, 7 Oct 2024 12:45:19 -0400 Subject: [PATCH 6/8] install nightly --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 791d3ef..50c2736 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,9 @@ jobs: - uses: taiki-e/install-action@cargo-hack + - name: Install latest nightly + run: rustup toolchain install nightly --component rustfmt --allow-downgrade + - name: feature compatibility run: make check-features From 01543df1f571284d5b022f37e3431d81a4be5993 Mon Sep 17 00:00:00 2001 From: Chloe Martin Date: Mon, 7 Oct 2024 12:50:10 -0400 Subject: [PATCH 7/8] reformat --- crates/iota-rust-sdk/src/lib.rs | 2 +- crates/iota-rust-sdk/src/types/checkpoint.rs | 8 ++++---- crates/iota-rust-sdk/src/types/crypto/multisig.rs | 4 ++-- crates/iota-rust-sdk/src/types/crypto/zklogin.rs | 6 +----- crates/iota-rust-sdk/src/types/effects/v1.rs | 2 +- crates/iota-rust-sdk/src/types/effects/v2.rs | 2 +- .../iota-rust-sdk/src/types/transaction/serialization.rs | 8 ++++---- crates/iota-rust-sdk/src/types/transaction/unresolved.rs | 2 +- crates/iota-rust-sdk/src/types/type_tag/parse.rs | 2 +- crates/iota-rust-sdk/src/types/type_tag/serialization.rs | 4 ++-- 10 files changed, 18 insertions(+), 22 deletions(-) diff --git a/crates/iota-rust-sdk/src/lib.rs b/crates/iota-rust-sdk/src/lib.rs index 30bf517..71944cc 100644 --- a/crates/iota-rust-sdk/src/lib.rs +++ b/crates/iota-rust-sdk/src/lib.rs @@ -120,8 +120,8 @@ mod _serde { #[cfg(feature = "schemars")] mod _schemars { use schemars::{ - schema::{InstanceType, Metadata, SchemaObject}, JsonSchema, + schema::{InstanceType, Metadata, SchemaObject}, }; pub(crate) struct U64; diff --git a/crates/iota-rust-sdk/src/types/checkpoint.rs b/crates/iota-rust-sdk/src/types/checkpoint.rs index 2498ede..fc64a23 100644 --- a/crates/iota-rust-sdk/src/types/checkpoint.rs +++ b/crates/iota-rust-sdk/src/types/checkpoint.rs @@ -386,8 +386,8 @@ mod serialization { where S: Serializer, { - let mut seq = serializer.serialize_seq(Some(self.0 .0.len()))?; - for txn in &self.0 .0 { + let mut seq = serializer.serialize_seq(Some(self.0.0.len()))?; + for txn in &self.0.0 { let digests = Digests { transaction: &txn.transaction, effects: &txn.effects, @@ -404,8 +404,8 @@ mod serialization { where S: Serializer, { - let mut seq = serializer.serialize_seq(Some(self.0 .0.len()))?; - for txn in &self.0 .0 { + let mut seq = serializer.serialize_seq(Some(self.0.0.len()))?; + for txn in &self.0.0 { seq.serialize_element(&txn.signatures)?; } seq.end() diff --git a/crates/iota-rust-sdk/src/types/crypto/multisig.rs b/crates/iota-rust-sdk/src/types/crypto/multisig.rs index e43b0eb..90086a9 100644 --- a/crates/iota-rust-sdk/src/types/crypto/multisig.rs +++ b/crates/iota-rust-sdk/src/types/crypto/multisig.rs @@ -1,7 +1,7 @@ use super::{ - zklogin::{ZkLoginAuthenticator, ZkLoginPublicIdentifier}, Ed25519PublicKey, Ed25519Signature, Secp256k1PublicKey, Secp256k1Signature, Secp256r1PublicKey, Secp256r1Signature, SignatureScheme, + zklogin::{ZkLoginAuthenticator, ZkLoginPublicIdentifier}, }; pub type WeightUnit = u8; @@ -166,8 +166,8 @@ mod serialization { use super::*; use crate::types::{ - crypto::{Base64Array33, Base64Array34}, Ed25519PublicKey, Secp256k1PublicKey, Secp256r1PublicKey, SignatureScheme, + crypto::{Base64Array33, Base64Array34}, }; pub struct Base64MultisigMemberPublicKey; diff --git a/crates/iota-rust-sdk/src/types/crypto/zklogin.rs b/crates/iota-rust-sdk/src/types/crypto/zklogin.rs index 826c683..35b4e67 100644 --- a/crates/iota-rust-sdk/src/types/crypto/zklogin.rs +++ b/crates/iota-rust-sdk/src/types/crypto/zklogin.rs @@ -159,11 +159,7 @@ impl Bn254FieldElement { } // If the value is '0' then just return a slice of length 1 of the final byte - if buf.is_empty() { - &self.0[31..] - } else { - buf - } + if buf.is_empty() { &self.0[31..] } else { buf } } pub fn padded(&self) -> &[u8] { diff --git a/crates/iota-rust-sdk/src/types/effects/v1.rs b/crates/iota-rust-sdk/src/types/effects/v1.rs index 569ea82..16274fa 100644 --- a/crates/iota-rust-sdk/src/types/effects/v1.rs +++ b/crates/iota-rust-sdk/src/types/effects/v1.rs @@ -1,7 +1,7 @@ use crate::types::{ + EpochId, GasCostSummary, ObjectId, ObjectReference, TransactionDigest, TransactionEventsDigest, execution_status::ExecutionStatus, object::{Owner, Version}, - EpochId, GasCostSummary, ObjectId, ObjectReference, TransactionDigest, TransactionEventsDigest, }; /// The response from processing a transaction or a certified transaction diff --git a/crates/iota-rust-sdk/src/types/effects/v2.rs b/crates/iota-rust-sdk/src/types/effects/v2.rs index 2e4faa6..d8ae5a1 100644 --- a/crates/iota-rust-sdk/src/types/effects/v2.rs +++ b/crates/iota-rust-sdk/src/types/effects/v2.rs @@ -1,8 +1,8 @@ use crate::types::{ + EpochId, GasCostSummary, ObjectDigest, ObjectId, TransactionDigest, TransactionEventsDigest, digest::EffectsAuxiliaryDataDigest, execution_status::ExecutionStatus, object::{Owner, Version}, - EpochId, GasCostSummary, ObjectDigest, ObjectId, TransactionDigest, TransactionEventsDigest, }; /// The response from processing a transaction or a certified transaction diff --git a/crates/iota-rust-sdk/src/types/transaction/serialization.rs b/crates/iota-rust-sdk/src/types/transaction/serialization.rs index 95e7f0b..f6e9e7e 100644 --- a/crates/iota-rust-sdk/src/types/transaction/serialization.rs +++ b/crates/iota-rust-sdk/src/types/transaction/serialization.rs @@ -7,8 +7,8 @@ use crate::types::{ObjectId, ObjectReference}; mod transaction { use super::*; use crate::types::{ - transaction::{GasPayment, Transaction, TransactionExpiration, TransactionKind}, Address, + transaction::{GasPayment, Transaction, TransactionExpiration, TransactionKind}, }; #[derive(serde_derive::Serialize)] @@ -321,8 +321,8 @@ mod transaction_kind { mod end_of_epoch { use super::*; use crate::types::{ - transaction::{AuthenticatorStateExpire, ChangeEpoch, EndOfEpochTransactionKind}, CheckpointDigest, + transaction::{AuthenticatorStateExpire, ChangeEpoch, EndOfEpochTransactionKind}, }; #[derive(serde_derive::Serialize)] @@ -967,8 +967,8 @@ mod signed_transaction { use super::*; use crate::types::{ - transaction::{SignedTransaction, Transaction}, UserSignature, + transaction::{SignedTransaction, Transaction}, }; /// Intents are defined as: @@ -1235,8 +1235,8 @@ mod test { use wasm_bindgen_test::wasm_bindgen_test as test; use crate::types::{ - transaction::{Argument, InputArgument, Transaction}, ObjectDigest, ObjectId, ObjectReference, + transaction::{Argument, InputArgument, Transaction}, }; #[test] diff --git a/crates/iota-rust-sdk/src/types/transaction/unresolved.rs b/crates/iota-rust-sdk/src/types/transaction/unresolved.rs index e20bdf1..c1c1200 100644 --- a/crates/iota-rust-sdk/src/types/transaction/unresolved.rs +++ b/crates/iota-rust-sdk/src/types/transaction/unresolved.rs @@ -1,5 +1,5 @@ use super::{Command, TransactionExpiration}; -use crate::types::{object::Version, Address, ObjectDigest, ObjectId}; +use crate::types::{Address, ObjectDigest, ObjectId, object::Version}; // A potentially Unresolved user transaction #[cfg_attr( diff --git a/crates/iota-rust-sdk/src/types/type_tag/parse.rs b/crates/iota-rust-sdk/src/types/type_tag/parse.rs index 354693d..c558603 100644 --- a/crates/iota-rust-sdk/src/types/type_tag/parse.rs +++ b/crates/iota-rust-sdk/src/types/type_tag/parse.rs @@ -1,9 +1,9 @@ use winnow::{ + PResult, Parser, ascii::space0, combinator::{alt, delimited, eof, opt, separated}, stream::AsChar, token::{one_of, take_while}, - PResult, Parser, }; use super::{Address, Identifier, StructTag, TypeTag}; diff --git a/crates/iota-rust-sdk/src/types/type_tag/serialization.rs b/crates/iota-rust-sdk/src/types/type_tag/serialization.rs index eded71b..f2a72dd 100644 --- a/crates/iota-rust-sdk/src/types/type_tag/serialization.rs +++ b/crates/iota-rust-sdk/src/types/type_tag/serialization.rs @@ -1,4 +1,4 @@ -use serde::{de::Visitor, Deserialize, Deserializer, Serialize, Serializer}; +use serde::{Deserialize, Deserializer, Serialize, Serializer, de::Visitor}; use serde_with::{DeserializeAs, SerializeAs}; use super::*; @@ -243,8 +243,8 @@ impl<'de> Deserialize<'de> for StructTag { #[cfg(feature = "schemars")] mod json_schema { use schemars::{ - schema::{InstanceType, Metadata, SchemaObject, StringValidation}, JsonSchema, + schema::{InstanceType, Metadata, SchemaObject, StringValidation}, }; use super::*; From 34f85408b2a5fcdcde34b280d01d5a3cb610facf Mon Sep 17 00:00:00 2001 From: Thibault Martinez Date: Tue, 8 Oct 2024 09:25:49 +0200 Subject: [PATCH 8/8] remove ignore external-crates --- rustfmt.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/rustfmt.toml b/rustfmt.toml index a2c0b3a..4dc6b95 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -6,4 +6,3 @@ imports_granularity = "Crate" normalize_comments = true normalize_doc_attributes = true wrap_comments = true -ignore = ["external-crates"]