From f964e21a807cc0b08d7b935e2133f37743dedac4 Mon Sep 17 00:00:00 2001
From: hu55a1n1 <sufialhussaini@gmail.com>
Date: Sat, 30 Dec 2023 04:56:07 -0800
Subject: [PATCH] More reorg

---
 utils/cw-prover/src/main.rs                      |  1 +
 utils/cw-prover/src/proof/cw.rs                  | 16 ++++++++++------
 utils/cw-prover/src/proof/key.rs                 |  3 ++-
 utils/cw-prover/src/proof/mod.rs                 |  5 ++---
 utils/cw-prover/src/proof/prefix.rs              |  5 +++--
 utils/cw-prover/src/{proof => }/verifier/cw.rs   |  5 +----
 .../cw-prover/src/{proof => }/verifier/ics23.rs  | 12 ++++++++----
 utils/cw-prover/src/{proof => }/verifier/mod.rs  |  0
 .../cw-prover/src/{proof => }/verifier/multi.rs  |  2 +-
 9 files changed, 28 insertions(+), 21 deletions(-)
 rename utils/cw-prover/src/{proof => }/verifier/cw.rs (87%)
 rename utils/cw-prover/src/{proof => }/verifier/ics23.rs (88%)
 rename utils/cw-prover/src/{proof => }/verifier/mod.rs (100%)
 rename utils/cw-prover/src/{proof => }/verifier/multi.rs (96%)

diff --git a/utils/cw-prover/src/main.rs b/utils/cw-prover/src/main.rs
index 47abeda..717a4e7 100644
--- a/utils/cw-prover/src/main.rs
+++ b/utils/cw-prover/src/main.rs
@@ -15,6 +15,7 @@
 )]
 
 mod proof;
+mod verifier;
 
 use std::error::Error;
 use std::fmt::Debug;
diff --git a/utils/cw-prover/src/proof/cw.rs b/utils/cw-prover/src/proof/cw.rs
index ea29a9b..8167796 100644
--- a/utils/cw-prover/src/proof/cw.rs
+++ b/utils/cw-prover/src/proof/cw.rs
@@ -1,13 +1,17 @@
-use crate::proof;
-use crate::proof::key::{IntoKeys, PrefixedKey};
-use crate::proof::prefix::PrefixWasm;
-use crate::proof::verifier::cw::CwVerifier;
-use crate::proof::Proof;
+use core::fmt::Debug;
+
 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> {
diff --git a/utils/cw-prover/src/proof/key.rs b/utils/cw-prover/src/proof/key.rs
index 05fd71f..45fa384 100644
--- a/utils/cw-prover/src/proof/key.rs
+++ b/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>>;
diff --git a/utils/cw-prover/src/proof/mod.rs b/utils/cw-prover/src/proof/mod.rs
index 8fffb26..1306d65 100644
--- a/utils/cw-prover/src/proof/mod.rs
+++ b/utils/cw-prover/src/proof/mod.rs
@@ -3,9 +3,8 @@ use ics23::CommitmentProof;
 use tendermint::merkle::proof::ProofOps;
 
 pub mod cw;
-mod key;
-mod prefix;
-mod verifier;
+pub mod key;
+pub mod prefix;
 
 // Copied from hermes
 pub fn convert_tm_to_ics_merkle_proof(
diff --git a/utils/cw-prover/src/proof/prefix.rs b/utils/cw-prover/src/proof/prefix.rs
index 62db0df..aa15a12 100644
--- a/utils/cw-prover/src/proof/prefix.rs
+++ b/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";
 }
diff --git a/utils/cw-prover/src/proof/verifier/cw.rs b/utils/cw-prover/src/verifier/cw.rs
similarity index 87%
rename from utils/cw-prover/src/proof/verifier/cw.rs
rename to utils/cw-prover/src/verifier/cw.rs
index 241644d..1b466ac 100644
--- a/utils/cw-prover/src/proof/verifier/cw.rs
+++ b/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::{
-    proof::verifier::ics23::Ics23MembershipVerifier, proof::verifier::multi::MultiVerifier,
-    proof::verifier::Verifier,
-};
+use crate::verifier::{ics23::Ics23MembershipVerifier, multi::MultiVerifier, Verifier};
 
 #[derive(Clone, Debug)]
 pub struct CwVerifier(MultiVerifier<Ics23MembershipVerifier<Vec<u8>, Vec<u8>>, 2>);
diff --git a/utils/cw-prover/src/proof/verifier/ics23.rs b/utils/cw-prover/src/verifier/ics23.rs
similarity index 88%
rename from utils/cw-prover/src/proof/verifier/ics23.rs
rename to utils/cw-prover/src/verifier/ics23.rs
index db60946..550470e 100644
--- a/utils/cw-prover/src/proof/verifier/ics23.rs
+++ b/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::{calculate_existence_root, verify_membership, CommitmentProof, ProofSpec};
-use std::marker::PhantomData;
+use ics23::{
+    calculate_existence_root, commitment_proof::Proof, verify_membership, CommitmentProof,
+    ProofSpec,
+};
+
+use crate::verifier::Verifier;
 
 #[derive(Clone, Debug)]
 pub struct Ics23MembershipVerifier<K, V> {
diff --git a/utils/cw-prover/src/proof/verifier/mod.rs b/utils/cw-prover/src/verifier/mod.rs
similarity index 100%
rename from utils/cw-prover/src/proof/verifier/mod.rs
rename to utils/cw-prover/src/verifier/mod.rs
diff --git a/utils/cw-prover/src/proof/verifier/multi.rs b/utils/cw-prover/src/verifier/multi.rs
similarity index 96%
rename from utils/cw-prover/src/proof/verifier/multi.rs
rename to utils/cw-prover/src/verifier/multi.rs
index 7f165bc..da586c0 100644
--- a/utils/cw-prover/src/proof/verifier/multi.rs
+++ b/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> {