More reorg

utils/cw-prover/src/main.rs

@@ -15,6 +15,7 @@
 )]
 
 mod proof;
+mod verifier;
 
 use std::error::Error;
 use std::fmt::Debug;

utils/cw-prover/src/proof/cw.rs

@@ -1,13 +1,17 @@
-use crate::proof;
+use core::fmt::Debug;
-use crate::proof::key::{IntoKeys, PrefixedKey};
+
-use crate::proof::prefix::PrefixWasm;
-use crate::proof::verifier::cw::CwVerifier;
-use crate::proof::Proof;
 use ibc_relayer_types::core::ics23_commitment::error::Error as ProofError;
-use std::fmt::Debug;
 use tendermint::merkle::proof::ProofOps;
 use tendermint_rpc::endpoint::abci_query::AbciQuery;
 
+use crate::{
+    proof,
+    proof::key::{IntoKeys, PrefixedKey},
+    proof::prefix::PrefixWasm,
+    proof::Proof,
+    verifier::cw::CwVerifier,
+};
+
 pub type RawCwProof = CwProof<Vec<u8>, Vec<u8>>;
 
 pub struct CwProof<K, V> {

utils/cw-prover/src/proof/key.rs

@@ -1,5 +1,6 @@
+use core::marker::PhantomData;
+
 use crate::proof::prefix::ConstPrefix;
-use std::marker::PhantomData;
 
 pub trait IntoKeys {
     fn into_keys(self) -> Vec<Vec<u8>>;

utils/cw-prover/src/proof/mod.rs

@@ -3,9 +3,8 @@ use ics23::CommitmentProof;
 use tendermint::merkle::proof::ProofOps;
 
 pub mod cw;
-mod key;
+pub mod key;
-mod prefix;
+pub mod prefix;
-mod verifier;
 
 // Copied from hermes
 pub fn convert_tm_to_ics_merkle_proof(

utils/cw-prover/src/proof/prefix.rs

@@ -1,9 +1,10 @@
-pub struct PrefixWasm;
-
 pub trait ConstPrefix {
     const PREFIX: &'static str;
 }
 
+#[derive(Clone, Debug)]
+pub struct PrefixWasm;
+
 impl ConstPrefix for PrefixWasm {
     const PREFIX: &'static str = "wasm";
 }

utils/cw-prover/src/verifier/cw.rs

@@ -1,10 +1,7 @@
 use ibc_relayer_types::core::ics23_commitment::error::Error as ProofError;
 use ics23::CommitmentProof;
 
-use crate::{
+use crate::verifier::{ics23::Ics23MembershipVerifier, multi::MultiVerifier, Verifier};
-    proof::verifier::ics23::Ics23MembershipVerifier, proof::verifier::multi::MultiVerifier,
-    proof::verifier::Verifier,
-};
 
 #[derive(Clone, Debug)]
 pub struct CwVerifier(MultiVerifier<Ics23MembershipVerifier<Vec<u8>, Vec<u8>>, 2>);

utils/cw-prover/src/verifier/ics23.rs

@@ -1,8 +1,12 @@
-use crate::proof::verifier::Verifier;
+use core::marker::PhantomData;
+
 use ibc_relayer_types::core::ics23_commitment::error::Error as ProofError;
-use ics23::commitment_proof::Proof;
+use ics23::{
-use ics23::{calculate_existence_root, verify_membership, CommitmentProof, ProofSpec};
+    calculate_existence_root, commitment_proof::Proof, verify_membership, CommitmentProof,
-use std::marker::PhantomData;
+    ProofSpec,
+};
+
+use crate::verifier::Verifier;
 
 #[derive(Clone, Debug)]
 pub struct Ics23MembershipVerifier<K, V> {

utils/cw-prover/src/verifier/multi.rs

@@ -1,4 +1,4 @@
-use crate::proof::verifier::Verifier;
+use crate::verifier::Verifier;
 
 #[derive(Clone, Debug)]
 pub struct MultiVerifier<V, const N: usize> {