aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamen Mladenov <kamen@syndamia.com>2025-04-02 14:07:50 +0300
committerKamen Mladenov <kamen@syndamia.com>2025-04-04 11:03:00 +0300
commitff022604ff4376903f403c8bb9b6ec4d4233432e (patch)
tree4e4586f8b1fe372ab75acd0caf2fe17238f293af
parent6e8dc24fb90c17ca272f4d457949aed6fe6aa540 (diff)
downloadzkVMs-benchmarks-ff022604ff4376903f403c8bb9b6ec4d4233432e.tar
zkVMs-benchmarks-ff022604ff4376903f403c8bb9b6ec4d4233432e.tar.gz
zkVMs-benchmarks-ff022604ff4376903f403c8bb9b6ec4d4233432e.zip
chore: Nix and Rust fmt
-rw-r--r--flake.nix4
-rw-r--r--guests_macro/src/parse_fn.rs8
-rw-r--r--zkvms/nexus/host/src/main.rs20
-rw-r--r--zkvms/nexus/wrapper_macro/src/lib.rs6
-rw-r--r--zkvms/zkm/default.nix4
-rw-r--r--zkvms/zkwasm/default.nix11
6 files changed, 32 insertions, 21 deletions
diff --git a/flake.nix b/flake.nix
index 675017c..b815571 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,8 +17,8 @@
# flake-utils.follows = "mcl-blockchain/flake-utils";
};
- outputs = { self, nixpkgs, mcl-blockchain, mcl-blockchain-old, crane
- , fenix, ... }:
+ outputs =
+ { self, nixpkgs, mcl-blockchain, mcl-blockchain-old, crane, fenix, ... }:
let
system = "x86_64-linux";
pkgs = import nixpkgs {
diff --git a/guests_macro/src/parse_fn.rs b/guests_macro/src/parse_fn.rs
index 3db397c..98d1017 100644
--- a/guests_macro/src/parse_fn.rs
+++ b/guests_macro/src/parse_fn.rs
@@ -51,7 +51,13 @@ pub fn split_fn(item: &TokenStream) -> (TokenStream, TokenStream, TokenStream) {
}
if ret.is_empty() {
- ret.extend([TokenTree::Group(Group::new(Delimiter::Parenthesis, TokenStream::new()))].into_iter());
+ ret.extend(
+ [TokenTree::Group(Group::new(
+ Delimiter::Parenthesis,
+ TokenStream::new(),
+ ))]
+ .into_iter(),
+ );
}
(name, args, ret)
}
diff --git a/zkvms/nexus/host/src/main.rs b/zkvms/nexus/host/src/main.rs
index 0ef044d..9693d02 100644
--- a/zkvms/nexus/host/src/main.rs
+++ b/zkvms/nexus/host/src/main.rs
@@ -1,7 +1,4 @@
-use nexus_sdk::{
- stwo::seq::Stwo,
- Local, Prover, Verifiable, Viewable,
-};
+use nexus_sdk::{stwo::seq::Stwo, Local, Prover, Verifiable, Viewable};
use zkvms_host_io::{
benchmarkable, read_args, Input, Return,
RunType::{Execute, Prove, Verify},
@@ -39,7 +36,8 @@ fn main() {
Verify => {
// Stwo<T> doesn't derive Clone
println!("Loading guest...");
- let prover: Stwo<Local> = Stwo::new_from_file(&elf_path).expect("failed to load guest program");
+ let prover: Stwo<Local> =
+ Stwo::new_from_file(&elf_path).expect("failed to load guest program");
println!("Proving execution of vm...");
let (view, proof) = prover
@@ -48,12 +46,14 @@ fn main() {
println!(
" output is {:?}!",
- view
- .public_output::<Return>()
- .expect("failed to deserialize output")
- );
+ view.public_output::<Return>()
+ .expect("failed to deserialize output")
+ );
- println!(">>>>> Logging\n{}<<<<<", view.logs().expect("failed to retrieve debug logs").join(""));
+ println!(
+ ">>>>> Logging\n{}<<<<<",
+ view.logs().expect("failed to retrieve debug logs").join("")
+ );
benchmarkable! {
print!("Verifying execution...");
diff --git a/zkvms/nexus/wrapper_macro/src/lib.rs b/zkvms/nexus/wrapper_macro/src/lib.rs
index 1441d0d..061a33f 100644
--- a/zkvms/nexus/wrapper_macro/src/lib.rs
+++ b/zkvms/nexus/wrapper_macro/src/lib.rs
@@ -46,7 +46,11 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream {
);
out.extend(
- format!("write_public_output::<{}>(&zkp::{}{});", ret, name, ts_patterns).parse::<TokenStream>(),
+ format!(
+ "write_public_output::<{}>(&zkp::{}{});",
+ ret, name, ts_patterns
+ )
+ .parse::<TokenStream>(),
);
let mut block = TokenStream::new();
diff --git a/zkvms/zkm/default.nix b/zkvms/zkm/default.nix
index 6c71c2d..d7df33a 100644
--- a/zkvms/zkm/default.nix
+++ b/zkvms/zkm/default.nix
@@ -1,5 +1,5 @@
-{ zkvmLib, lib, just, metacraft-labs, metacraft-labs-old, protobuf
-, pkg-config, openssl, buildGoModule, fetchFromGitHub, craneLib-default, }:
+{ zkvmLib, lib, just, metacraft-labs, metacraft-labs-old, protobuf, pkg-config
+, openssl, buildGoModule, fetchFromGitHub, craneLib-default, }:
let
commonArgs = {
pname = "zkm";
diff --git a/zkvms/zkwasm/default.nix b/zkvms/zkwasm/default.nix
index e78d721..185e849 100644
--- a/zkvms/zkwasm/default.nix
+++ b/zkvms/zkwasm/default.nix
@@ -15,11 +15,12 @@ let
rust-toolchain = let
toolchain-arg = {
- channel = "nightly";
- date = "2024-04-09";
- sha256 = "sha256-Pf/EIA/M8/JpX7naMcutqBajVwhZoqrPkkyBwho6dyI=";
- };
- in with fenix; combine [
+ channel = "nightly";
+ date = "2024-04-09";
+ sha256 = "sha256-Pf/EIA/M8/JpX7naMcutqBajVwhZoqrPkkyBwho6dyI=";
+ };
+ in with fenix;
+ combine [
(toolchainOf toolchain-arg).minimalToolchain
(targets.wasm32-unknown-unknown.toolchainOf toolchain-arg).toolchain
];