From b5000e6bbc8d3a324fb1df49c72cd05f902a9d05 Mon Sep 17 00:00:00 2001 From: Tom French Date: Wed, 26 Apr 2023 00:43:18 +0100 Subject: [PATCH] chore: migrate the verifier contract to `acvm-backend-barretenberg` --- .../src/acvm_interop}/contract.sol | 0 acvm_backend_barretenberg/src/acvm_interop/smart_contract.rs | 4 +++- common/src/contract.rs | 4 ---- common/src/lib.rs | 3 --- 4 files changed, 3 insertions(+), 8 deletions(-) rename {common/src => acvm_backend_barretenberg/src/acvm_interop}/contract.sol (100%) delete mode 100644 common/src/contract.rs diff --git a/common/src/contract.sol b/acvm_backend_barretenberg/src/acvm_interop/contract.sol similarity index 100% rename from common/src/contract.sol rename to acvm_backend_barretenberg/src/acvm_interop/contract.sol diff --git a/acvm_backend_barretenberg/src/acvm_interop/smart_contract.rs b/acvm_backend_barretenberg/src/acvm_interop/smart_contract.rs index 1d277273..89b53c8e 100644 --- a/acvm_backend_barretenberg/src/acvm_interop/smart_contract.rs +++ b/acvm_backend_barretenberg/src/acvm_interop/smart_contract.rs @@ -1,9 +1,11 @@ use common::acvm::SmartContract; use common::crs::G2; -use common::ULTRA_VERIFIER_CONTRACT; use crate::Barretenberg; +/// Embed the Solidity verifier file +const ULTRA_VERIFIER_CONTRACT: &str = include_str!("contract.sol"); + #[cfg(feature = "native")] impl SmartContract for Barretenberg { fn eth_contract_from_vk(&self, verification_key: &[u8]) -> String { diff --git a/common/src/contract.rs b/common/src/contract.rs deleted file mode 100644 index d43687ff..00000000 --- a/common/src/contract.rs +++ /dev/null @@ -1,4 +0,0 @@ -#[macro_use] -pub mod cryptography; - -pub mod turbo_verifier; diff --git a/common/src/lib.rs b/common/src/lib.rs index 03098f2e..6f5e834e 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -11,6 +11,3 @@ pub mod proof; // Re-export acvm pub use acvm; - -/// Embed the Solidity verifier file -pub const ULTRA_VERIFIER_CONTRACT: &str = include_str!("contract.sol");