Merge 665891918519b30c1293114c790546f3b8988c3f into e2b8bf42a585c6669be262e3624f4b2b3060037a

shake256-33bytes-demo/Cargo.toml

@@ -2,7 +2,6 @@
 name = "shake256-33bytes-demo"
 version = "0.1.0"
 edition = "2021"
-build = "build.rs"
 
 [[bin]]
 name = "shake256-33bytes-demo"
@@ -18,15 +17,10 @@ hkdf = "0.12"
 sha3 = "0.10"
 serde-big-array = "0.5"
 tiny-keccak = { version = "2", default-features = false, features = ["shake"] }  # ADD
+methods = {path = "methods"}
 
 [dev-dependencies]
 rand = "0.8"
 cipher = { version = "0.4", features = ["std"] }
 serde = { version = "1", default-features = false, features = ["derive", "alloc"] }
 
-[package.metadata.risc0]
-methods = ["methods/guest"]
-# methods = {path = "methods"}
-
- [build-dependencies]
- risc0-build = "2.3.1"

shake256-33bytes-demo/build.rs

@@ -1,3 +0,0 @@
-fn main() {
-    risc0_build::embed_methods();
-}

shake256-33bytes-demo/methods/Cargo.toml

@@ -8,4 +8,3 @@ risc0-build = { version = "2.3.1" }
 
 [package.metadata.risc0]
 methods = ["guest"]
-

shake256-33bytes-demo/src/lib.rs

@@ -1,9 +1,5 @@
-pub mod methods {
-    include!(concat!(env!("OUT_DIR"), "/methods.rs"));
-}
-
-
 use serde::{Deserialize, Serialize};
+
 // ---------- 33-byte wrapper (public) ----------
 pub mod ser_bytes33 {                // (public so main.rs can use it)
     use core::fmt;

shake256-33bytes-demo/src/main.rs

@@ -3,7 +3,7 @@ use risc0_zkvm::{default_prover, ExecutorEnv};
 
 use shake256_33bytes_demo::{EncInput, enc_xor_shake256, nssa_kdf};      // now works via re-exports
 use shake256_33bytes_demo::ser_bytes33::Bytes33;                        // for constructing wrapper
-use shake256_33bytes_demo::methods::GUEST_ELF;                          // generated guest image
+use methods::GUEST_ELF;                          // generated guest image
 
 fn main() -> anyhow::Result<()> {