Merge 533b2d8 into b9d2703

vacp2p · Dec 4, 2024 · b8c2d8b · b8c2d8b
2 parents b9d2703 + 533b2d8
commit b8c2d8b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -88,7 +88,8 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          # TODO: Update to stable once wasmer supports it
+          toolchain: 1.82.0
           override: true
       - uses: Swatinem/rust-cache@v2
       - name: Install Dependencies

diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
@@ -94,7 +94,8 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          # TODO: Update to stable once wasmer supports it
+          toolchain: 1.82.0
           override: true
       - uses: Swatinem/rust-cache@v2
       - name: Install dependencies

diff --git a/rln/src/ffi.rs b/rln/src/ffi.rs
@@ -157,10 +157,10 @@ impl ProcessArg for *mut RLN {
     }
 }
 
-/// Buffer struct is taken from
-/// <https://github.com/celo-org/celo-threshold-bls-rs/blob/master/crates/threshold-bls-ffi/src/ffi.rs>
-///
-/// Also heavily inspired by <https://github.com/kilic/rln/blob/master/src/ffi.rs>
+///// Buffer struct is taken from
+///// <https://github.com/celo-org/celo-threshold-bls-rs/blob/master/crates/threshold-bls-ffi/src/ffi.rs>
+/////
+///// Also heavily inspired by <https://github.com/kilic/rln/blob/master/src/ffi.rs>
 
 #[repr(C)]
 #[derive(Clone, Debug, PartialEq)]

diff --git a/utils/src/merkle_tree/full_merkle_tree.rs b/utils/src/merkle_tree/full_merkle_tree.rs
@@ -8,7 +8,7 @@ use std::{
 };
 
 ////////////////////////////////////////////////////////////
-/// Full Merkle Tree Implementation
+///// Full Merkle Tree Implementation
 ////////////////////////////////////////////////////////////
 
 /// Merkle tree with all leaf and intermediate hashes stored

diff --git a/utils/src/merkle_tree/optimal_merkle_tree.rs b/utils/src/merkle_tree/optimal_merkle_tree.rs
@@ -6,7 +6,7 @@ use std::str::FromStr;
 use std::{cmp::max, fmt::Debug};
 
 ////////////////////////////////////////////////////////////
-/// Optimal Merkle Tree Implementation
+///// Optimal Merkle Tree Implementation
 ////////////////////////////////////////////////////////////
 
 /// The Merkle tree structure
@@ -55,7 +55,9 @@ impl FromStr for OptimalMerkleConfig {
     }
 }
 
-/// Implementations
+////////////////////////////////////////////////////////////
+///// Implementations
+////////////////////////////////////////////////////////////
 
 impl<H: Hasher> ZerokitMerkleTree for OptimalMerkleTree<H>
 where