From cc458e3303bb262bb2e319f5f30b7aa838c09241 Mon Sep 17 00:00:00 2001
From: Sergio Chouhy <sergio.chouhy@gmail.com>
Date: Fri, 15 Aug 2025 18:29:19 -0300
Subject: [PATCH] proposed changes

---
 shake256-33bytes-demo/Cargo.toml         | 11 +----------
 shake256-33bytes-demo/build.rs           |  3 ---
 shake256-33bytes-demo/methods/Cargo.toml |  2 +-
 shake256-33bytes-demo/methods/src/lib.rs |  1 +
 shake256-33bytes-demo/src/lib.rs         |  5 -----
 shake256-33bytes-demo/src/main.rs        |  2 +-
 6 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 shake256-33bytes-demo/build.rs
 create mode 100644 shake256-33bytes-demo/methods/src/lib.rs

diff --git a/shake256-33bytes-demo/Cargo.toml b/shake256-33bytes-demo/Cargo.toml
index 364a1ae..dad9922 100644
--- a/shake256-33bytes-demo/Cargo.toml
+++ b/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,18 +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"] }
 
-
-[build-dependencies]
-risc0-build = "2.3.1"
-
-[package.metadata.risc0]
-methods = ["methods/guest"]
-
-[lints.rust]
-unexpected_cfgs = { level = "allow", check-cfg = ['cfg(rust_analyzer)'] }
\ No newline at end of file
diff --git a/shake256-33bytes-demo/build.rs b/shake256-33bytes-demo/build.rs
deleted file mode 100644
index 08a8a4e..0000000
--- a/shake256-33bytes-demo/build.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    risc0_build::embed_methods();
-}
diff --git a/shake256-33bytes-demo/methods/Cargo.toml b/shake256-33bytes-demo/methods/Cargo.toml
index 9ab59da..f5da0df 100644
--- a/shake256-33bytes-demo/methods/Cargo.toml
+++ b/shake256-33bytes-demo/methods/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 risc0-build = { version = "2.3.1" }
 
 [package.metadata.risc0]
-methods = ["methods/guest"]
+methods = ["guest"]
diff --git a/shake256-33bytes-demo/methods/src/lib.rs b/shake256-33bytes-demo/methods/src/lib.rs
new file mode 100644
index 0000000..1bdb308
--- /dev/null
+++ b/shake256-33bytes-demo/methods/src/lib.rs
@@ -0,0 +1 @@
+include!(concat!(env!("OUT_DIR"), "/methods.rs"));
diff --git a/shake256-33bytes-demo/src/lib.rs b/shake256-33bytes-demo/src/lib.rs
index 2bffbc1..9ff6af8 100644
--- a/shake256-33bytes-demo/src/lib.rs
+++ b/shake256-33bytes-demo/src/lib.rs
@@ -1,10 +1,5 @@
 use serde::{Deserialize, Serialize};
 
-// ---------- expose generated guest constants ----------  
-pub mod methods {                   
-    include!(concat!(env!("OUT_DIR"), "/methods.rs"));
-}
-// -------------------------------------------------------
 
 // ---------- 33-byte wrapper (public) ----------
 pub mod ser_bytes33 {                // (public so main.rs can use it)
diff --git a/shake256-33bytes-demo/src/main.rs b/shake256-33bytes-demo/src/main.rs
index 50532da..0e47728 100644
--- a/shake256-33bytes-demo/src/main.rs
+++ b/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<()> {