diff --git a/shake256-33bytes-demo/Cargo.toml b/shake256-33bytes-demo/Cargo.toml index f460966..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,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" \ 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 f23f0a5..0000000 --- a/shake256-33bytes-demo/build.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - risc0_build::embed_methods(); -} \ No newline at end of file diff --git a/shake256-33bytes-demo/methods/Cargo.toml b/shake256-33bytes-demo/methods/Cargo.toml index 09de514..f5da0df 100644 --- a/shake256-33bytes-demo/methods/Cargo.toml +++ b/shake256-33bytes-demo/methods/Cargo.toml @@ -8,4 +8,3 @@ risc0-build = { version = "2.3.1" } [package.metadata.risc0] methods = ["guest"] - diff --git a/shake256-33bytes-demo/src/lib.rs b/shake256-33bytes-demo/src/lib.rs index 044f796..b246a12 100644 --- a/shake256-33bytes-demo/src/lib.rs +++ b/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; diff --git a/shake256-33bytes-demo/src/main.rs b/shake256-33bytes-demo/src/main.rs index b6e7f26..244d12e 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<()> {