Merge pull request #485 from Concordium/cor-1763

eb-concordium · web-flow · commit 352c1a0754b4 · 2025-09-02T13:15:08.000+02:00
Update Rust formatter
diff --git a/.github/workflows/deploy-ccd-js-gen.yml b/.github/workflows/deploy-ccd-js-gen.yml
@@ -23,7 +23,6 @@ concurrency:
 env:
   NODE_VERSION: 18.16.0
   RUST_VERSION: 1.73
-  RUST_FMT: nightly-2023-04-01-x86_64-unknown-linux-gnu
 
 jobs:
   build:
diff --git a/.github/workflows/deploy-react-components.yml b/.github/workflows/deploy-react-components.yml
@@ -23,7 +23,6 @@ concurrency:
 env:
   NODE_VERSION: 18.16.0
   RUST_VERSION: 1.73
-  RUST_FMT: nightly-2023-04-01-x86_64-unknown-linux-gnu
 
 jobs:
   build:
diff --git a/.github/workflows/deploy-rust-bindings.yml b/.github/workflows/deploy-rust-bindings.yml
@@ -23,7 +23,6 @@ concurrency:
 env:
   NODE_VERSION: 18.16.0
   RUST_VERSION: 1.73 ## Make sure to update wasm-pack to 0.13 or higher when this is rust version 1.74 or higher
-  RUST_FMT: nightly-2023-04-01-x86_64-unknown-linux-gnu
 
 jobs:
   build:
diff --git a/.github/workflows/deploy-sdk.yml b/.github/workflows/deploy-sdk.yml
@@ -23,7 +23,6 @@ concurrency:
 env:
   NODE_VERSION: 18.16.0
   RUST_VERSION: 1.73
-  RUST_FMT: nightly-2023-04-01-x86_64-unknown-linux-gnu
 
 jobs:
   build:
diff --git a/.github/workflows/deploy-wallet-connectors.yml b/.github/workflows/deploy-wallet-connectors.yml
@@ -23,7 +23,6 @@ concurrency:
 env:
   NODE_VERSION: 18.16.0
   RUST_VERSION: 1.73
-  RUST_FMT: nightly-2023-04-01-x86_64-unknown-linux-gnu
 
 jobs:
   build:
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -15,7 +15,6 @@ env:
   DUMMY: 3 # For cache busting.
   NODE_VERSION: 18.16.0
   RUST_VERSION: 1.73
-  RUST_FMT: nightly-2023-04-01-x86_64-unknown-linux-gnu
 
 jobs:
   deps:
@@ -311,7 +310,7 @@ jobs:
 
       - name: Install formatter
         run: |
-          rustup default ${{ env.RUST_FMT }}
+          rustup default ${{ env.RUST_VERSION }}
           rustup component add rustfmt
 
       - name: Format
diff --git a/packages/rust-bindings/packages/common/src/helpers.rs b/packages/rust-bindings/packages/common/src/helpers.rs
@@ -5,4 +5,6 @@ use crate::types::JsonString;
 
 pub type JsResult<T = JsonString> = Result<T, JsError>;
 
-pub fn to_js_error(error: impl Display) -> JsError { JsError::new(&format!("{}", error)) }
+pub fn to_js_error(error: impl Display) -> JsError {
+    JsError::new(&format!("{}", error))
+}
diff --git a/packages/rust-bindings/packages/wallet/src/aux_functions.rs b/packages/rust-bindings/packages/wallet/src/aux_functions.rs
@@ -114,16 +114,16 @@ fn get_net(net: &str) -> Result<Net> {
 #[derive(SerdeSerialize, SerdeDeserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CredentialInput {
-    ip_info:             IpInfo<constants::IpPairing>,
-    global_context:      GlobalContext<constants::ArCurve>,
-    ars_infos:           BTreeMap<ArIdentity, ArInfo<constants::ArCurve>>,
-    id_object:           IdentityObjectV1<constants::IpPairing, constants::ArCurve, AttributeKind>,
+    ip_info: IpInfo<constants::IpPairing>,
+    global_context: GlobalContext<constants::ArCurve>,
+    ars_infos: BTreeMap<ArIdentity, ArInfo<constants::ArCurve>>,
+    id_object: IdentityObjectV1<constants::IpPairing, constants::ArCurve, AttributeKind>,
     revealed_attributes: Vec<AttributeTag>,
-    seed_as_hex:         HexString,
-    net:                 String,
-    identity_index:      u32,
-    cred_number:         u8,
-    expiry:              TransactionTime,
+    seed_as_hex: HexString,
+    net: String,
+    identity_index: u32,
+    cred_number: u8,
+    expiry: TransactionTime,
 }
 
 pub fn create_credential_v1_aux(input: CredentialInput) -> Result<JsonString> {
@@ -227,7 +227,7 @@ pub fn generate_unsigned_credential_aux(input: &str) -> Result<JsonString> {
 
     let public_keys: Vec<VerifyKey> = try_get(&v, "publicKeys")?;
     let cred_key_info = CredentialPublicKeys {
-        keys:      build_key_map(&public_keys),
+        keys: build_key_map(&public_keys),
         threshold: try_get(&v, "threshold")?,
     };
 
@@ -323,7 +323,7 @@ pub fn get_credential_deployment_details_aux(
     let acc_cred = AccountCredential::Normal { cdi };
 
     let credential_message = AccountCredentialMessage {
-        credential:     acc_cred,
+        credential: acc_cred,
         message_expiry: TransactionTime { seconds: expiry },
     };
 
@@ -371,20 +371,20 @@ pub fn get_credential_deployment_info_aux(
 #[serde(rename_all = "camelCase")]
 pub struct IdProofInput {
     id_object: IdentityObjectV1<constants::IpPairing, constants::ArCurve, AttributeKind>,
-    global_context:          GlobalContext<constants::ArCurve>,
-    seed_as_hex:             String,
-    net:                     String,
+    global_context: GlobalContext<constants::ArCurve>,
+    seed_as_hex: String,
+    net: String,
     identity_provider_index: u32,
-    identity_index:          u32,
-    cred_number:             u8,
-    statement:               Statement<constants::ArCurve, AttributeKind>,
-    challenge:               String,
+    identity_index: u32,
+    cred_number: u8,
+    statement: Statement<constants::ArCurve, AttributeKind>,
+    challenge: String,
 }
 
 #[derive(SerdeSerialize, SerdeDeserialize)]
 struct IdProofOutput {
     credential: String,
-    proof:      Versioned<Proof<constants::ArCurve, AttributeKind>>,
+    proof: Versioned<Proof<constants::ArCurve, AttributeKind>>,
 }
 
 pub fn create_id_proof_aux(input: IdProofInput) -> Result<JsonString> {
@@ -438,7 +438,7 @@ pub fn create_id_proof_aux(input: IdProofInput) -> Result<JsonString> {
 
     let out = IdProofOutput {
         credential: base16_encode_string(&credential),
-        proof:      Versioned::new(VERSION_0, proof),
+        proof: Versioned::new(VERSION_0, proof),
     };
 
     Ok(json!(out).to_string())
@@ -450,7 +450,9 @@ struct Web3SecretKey(
 );
 
 impl Web3IdSigner for Web3SecretKey {
-    fn id(&self) -> concordium_base::ed25519::PublicKey { self.0.id() }
+    fn id(&self) -> concordium_base::ed25519::PublicKey {
+        self.0.id()
+    }
 
     fn sign(&self, msg: &impl AsRef<[u8]>) -> concordium_base::ed25519::Signature {
         self.0.sign(msg)
@@ -460,8 +462,8 @@ impl Web3IdSigner for Web3SecretKey {
 #[derive(SerdeDeserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Web3IdProofInput {
-    request:           Request<constants::ArCurve, Web3IdAttribute>,
-    global_context:    GlobalContext<constants::ArCurve>,
+    request: Request<constants::ArCurve, Web3IdAttribute>,
+    global_context: GlobalContext<constants::ArCurve>,
     commitment_inputs:
         Vec<OwnedCommitmentInputs<constants::ArCurve, Web3IdAttribute, Web3SecretKey>>,
 }
@@ -491,28 +493,28 @@ pub fn serialize_credential_deployment_payload_aux(
 #[derive(SerdeSerialize, SerdeDeserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct UnsignedCredentialInput {
-    ip_info:                  IpInfo<constants::IpPairing>,
-    global_context:           GlobalContext<constants::ArCurve>,
-    ars_infos:                BTreeMap<ArIdentity, ArInfo<constants::ArCurve>>,
+    ip_info: IpInfo<constants::IpPairing>,
+    global_context: GlobalContext<constants::ArCurve>,
+    ars_infos: BTreeMap<ArIdentity, ArInfo<constants::ArCurve>>,
     id_object: IdentityObjectV1<constants::IpPairing, constants::ArCurve, AttributeKind>,
-    id_cred_sec:              PedersenValue<ArCurve>,
-    prf_key:                  prf::SecretKey<ArCurve>,
+    id_cred_sec: PedersenValue<ArCurve>,
+    prf_key: prf::SecretKey<ArCurve>,
     sig_retrievel_randomness: String,
-    credential_public_keys:   CredentialPublicKeys,
-    attribute_randomness:     BTreeMap<AttributeTag, PedersenRandomness<ArCurve>>,
-    revealed_attributes:      Vec<AttributeTag>,
-    cred_number:              u8,
+    credential_public_keys: CredentialPublicKeys,
+    attribute_randomness: BTreeMap<AttributeTag, PedersenRandomness<ArCurve>>,
+    revealed_attributes: Vec<AttributeTag>,
+    cred_number: u8,
 }
 
 #[derive(SerdeSerialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BakerKeys {
     #[serde(flatten)]
-    keys_payload:         ConfigureBakerKeysPayload,
+    keys_payload: ConfigureBakerKeysPayload,
     #[serde(serialize_with = "base16_encode", rename = "electionPrivateKey")]
     election_private_key: BakerElectionSignKey,
     #[serde(serialize_with = "base16_encode", rename = "signatureSignKey")]
-    signature_sign_key:   BakerSignatureSignKey,
+    signature_sign_key: BakerSignatureSignKey,
     #[serde(serialize_with = "base16_encode", rename = "aggregationSignKey")]
     aggregation_sign_key: BakerAggregationSignKey,
 }
@@ -533,14 +535,14 @@ pub fn generate_baker_keys(sender: AccountAddress) -> Result<JsonString> {
 #[derive(SerdeDeserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct VerifyWeb3IdCredentialSignatureInput {
-    global_context:    GlobalContext<constants::ArCurve>,
-    values:            BTreeMap<String, Web3IdAttribute>,
-    randomness:        BTreeMap<String, PedersenRandomness<constants::ArCurve>>,
+    global_context: GlobalContext<constants::ArCurve>,
+    values: BTreeMap<String, Web3IdAttribute>,
+    randomness: BTreeMap<String, PedersenRandomness<constants::ArCurve>>,
     #[serde(serialize_with = "base16_encode", deserialize_with = "base16_decode")]
-    signature:         concordium_base::ed25519::Signature,
-    holder:            CredentialHolderId,
+    signature: concordium_base::ed25519::Signature,
+    holder: CredentialHolderId,
     issuer_public_key: IssuerKey,
-    issuer_contract:   ContractAddress,
+    issuer_contract: ContractAddress,
 }
 
 pub fn verify_web3_id_credential_signature_aux(
diff --git a/packages/rust-bindings/packages/wallet/src/external_functions.rs b/packages/rust-bindings/packages/wallet/src/external_functions.rs
@@ -294,9 +294,9 @@ pub fn verify_web3_id_credential_signature_ext(raw_input: JsonString) -> JsResul
 #[derive(serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct VerifyPresentationInput {
-    presentation:   Presentation<ArCurve, Web3IdAttribute>,
+    presentation: Presentation<ArCurve, Web3IdAttribute>,
     global_context: GlobalContext<ArCurve>,
-    public_data:    Vec<CredentialsInputs<ArCurve>>,
+    public_data: Vec<CredentialsInputs<ArCurve>>,
 }
 
 #[wasm_bindgen(js_name = verifyPresentation)]
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,21 +1,2 @@
-edition="2018"
-combine_control_expr = false
-wrap_comments = true
-brace_style = "PreferSameLine"
-enum_discrim_align_threshold = 20
-fn_single_line = true
-format_strings = true
-format_macro_matchers = true
-format_macro_bodies = true
-imports_granularity = "Crate"
-normalize_comments = true
-reorder_impl_items = true
+edition = "2021"
 reorder_imports = true
-struct_field_align_threshold = 20
-trailing_semicolon = true
-type_punctuation_density = "Wide"
-use_field_init_shorthand = true
-use_try_shorthand = true
-format_code_in_doc_comments = true
-overflow_delimited_expr = true
-normalize_doc_attributes = true
