From 8b049305834914c84aa4eea08864d074c82ea79f Mon Sep 17 00:00:00 2001 From: Ekaterina Broslavskaya Date: Wed, 4 Dec 2024 21:50:52 +0700 Subject: [PATCH] Freeze rust version (#272) --- .github/workflows/ci.yml | 3 ++- .github/workflows/nightly-release.yml | 3 ++- rln/src/ffi.rs | 8 ++++---- utils/src/merkle_tree/full_merkle_tree.rs | 2 +- utils/src/merkle_tree/optimal_merkle_tree.rs | 6 ++++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 820cde4..958bdb7 100644 --- 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 index b13f78f..ff86079 100644 --- 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 index 283ab5e..0d2cd70 100644 --- a/rln/src/ffi.rs +++ b/rln/src/ffi.rs @@ -157,10 +157,10 @@ impl ProcessArg for *mut RLN { } } -/// Buffer struct is taken from -/// -/// -/// Also heavily inspired by +///// Buffer struct is taken from +///// +///// +///// Also heavily inspired by #[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 index eea6c10..11610ca 100644 --- 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 index 6ee4578..40c3fc1 100644 --- 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 ZerokitMerkleTree for OptimalMerkleTree where