diff --git a/crates/nargo_cli/Cargo.toml b/crates/nargo_cli/Cargo.toml index a1c15997ef5..22ce540a4e6 100644 --- a/crates/nargo_cli/Cargo.toml +++ b/crates/nargo_cli/Cargo.toml @@ -61,5 +61,4 @@ default = ["plonk_bn254"] # The plonk backend can only use bn254, so we do not specify the field plonk_bn254 = ["acvm-backend-barretenberg/native"] plonk_bn254_wasm = ["acvm-backend-barretenberg/wasm"] -flat_witness = ["acvm-backend-barretenberg/native"] diff --git a/crates/nargo_cli/src/backends.rs b/crates/nargo_cli/src/backends.rs index 39fbc2f24d2..bbec5c99006 100644 --- a/crates/nargo_cli/src/backends.rs +++ b/crates/nargo_cli/src/backends.rs @@ -1,6 +1,6 @@ pub(crate) use acvm_backend_barretenberg::Barretenberg as ConcreteBackend; -#[cfg(not(any(feature = "plonk_bn254", feature = "plonk_bn254_wasm", feature = "flat_witness")))] +#[cfg(not(any(feature = "plonk_bn254", feature = "plonk_bn254_wasm")))] compile_error!("please specify a backend to compile with"); #[cfg(all(feature = "plonk_bn254", feature = "plonk_bn254_wasm"))] diff --git a/crates/nargo_cli/src/cli/fs/witness.rs b/crates/nargo_cli/src/cli/fs/witness.rs index edfb1aa63d6..1a2cf88f4a1 100644 --- a/crates/nargo_cli/src/cli/fs/witness.rs +++ b/crates/nargo_cli/src/cli/fs/witness.rs @@ -14,30 +14,9 @@ pub(crate) fn save_witness_to_dir>( create_named_dir(witness_dir.as_ref(), "witness"); let witness_path = witness_dir.as_ref().join(witness_name).with_extension(WITNESS_EXT); - let buf: Vec = serialize_witness_map(witnesses)?; + let buf: Vec = witnesses.try_into()?; write_to_file(buf.as_slice(), &witness_path); Ok(witness_path) } - -#[cfg(not(feature = "flat_witness"))] -fn serialize_witness_map(witnesses: WitnessMap) -> Result, FilesystemError> { - let buf: Vec = witnesses.try_into()?; - Ok(buf) -} - -#[cfg(feature = "flat_witness")] -fn serialize_witness_map(witnesses: WitnessMap) -> Result, FilesystemError> { - let mut buf: Vec = Vec::new(); - let mut counter = 1; - for (index, value) in witnesses { - while counter < index.witness_index() { - buf.extend(vec![0; 32]); - counter += 1; - } - buf.extend_from_slice(&value.to_be_bytes()); - counter += 1; - } - Ok(buf) -}