fix to gears after refactor

Cargo.toml

@@ -11,29 +11,29 @@ members = [
   "trees",
   "kv_store",
   "keyring",
-  # "gears",
+  "gears",
 
   # # macros
-  # "macros/tx-derive",
-  # "macros/query-derive",
-  # "macros/protobuf-derive",
-  # "macros/key-derive",
+  "macros/tx-derive",
+  "macros/query-derive",
+  "macros/protobuf-derive",
+  "macros/key-derive",
 
   # GAIA
-  # "gaia-rs",
+  "gaia-rs",
 
   # xmodules
-  # "x/auth",
-  # "x/bank",
-  # "x/distribution",
-  # "x/evidence",
-  # "x/gov",
-  # "x/ibc-rs",
-  # "x/slashing",
-  # "x/staking",
-  # "x/genutil", 
-  # "x/upgrade", 
-  # "x/mint",
+  "x/auth",
+  "x/bank",
+  "x/distribution",
+  "x/evidence",
+  "x/gov",
+  "x/ibc-rs",
+  "x/slashing",
+  "x/staking",
+  "x/genutil", 
+  "x/upgrade", 
+  "x/mint",
 
   # new unsorted
 ]

gears/src/baseapp/mod.rs

@@ -2,6 +2,7 @@ pub mod options;
 use std::{
     fmt::Debug,
     marker::PhantomData,
+    num::NonZero,
     sync::{Arc, RwLock},
 };
 
@@ -104,13 +105,16 @@ impl<DB: Database, PSK: ParamsSubspaceKey, H: ABCIHandler, AI: ApplicationInfo>
 
     fn run_query(&self, request: &RequestQuery) -> Result<Bytes, QueryError> {
         //TODO: request height u32
-        let version: u32 = request
-            .height
-            .try_into()
-            .map_err(|_| QueryError::InvalidHeight)?;
+        let version: NonZero<u32> = NonZero::new(
+            request
+                .height
+                .try_into()
+                .map_err(|_| QueryError::InvalidHeight)?,
+        )
+        .ok_or(QueryError::InvalidHeight)?;
 
         let store = self.multi_store.read().expect(POISONED_LOCK);
-        let ctx = QueryContext::new(QueryMultiStore::new(&*store, version)?, version)?;
+        let ctx = QueryContext::new(QueryMultiStore::new(&*store, Some(version))?, version.get())?;
 
         self.abci_handler
             .query(&ctx, request.clone())

gears/src/baseapp/query.rs

@@ -1,3 +1,5 @@
+use std::num::NonZero;
+
 use database::Database;
 use kv_store::query::QueryMultiStore;
 use serde::Serialize;
@@ -37,7 +39,10 @@ impl<DB: Database, PSK: ParamsSubspaceKey, H: ABCIHandler, AI: ApplicationInfo>
         let version = request.height();
 
         let store = self.multi_store.read().expect(POISONED_LOCK);
-        let ctx = QueryContext::new(QueryMultiStore::new(&*store, version)?, version)?;
+        let ctx = QueryContext::new(
+            QueryMultiStore::new(&*store, NonZero::new(version))?,
+            version,
+        )?;
         Ok(self.abci_handler.typed_query(&ctx, request))
     }
 }

gears/src/types/auth/fee.rs

@@ -17,8 +17,8 @@ use crate::types::base::errors::CoinsError;
 use super::gas::{Gas, GasError};
 
 pub mod inner {
-    pub use core_types::auth::fee::Fee;
-    pub use core_types::base::coin::Coin;
+    pub use core_types::auth::Fee;
+    pub use core_types::base::Coin;
 }
 
 /// Fee includes the amount of coins paid in fees and the maximum

gears/src/types/auth/gas.rs

@@ -4,8 +4,8 @@ use std::{num::ParseIntError, str::FromStr};
 use ux::u63;
 
 pub mod inner {
-    pub use core_types::auth::fee::Fee;
-    pub use core_types::base::coin::Coin;
+    pub use core_types::auth::Fee;
+    pub use core_types::base::Coin;
 }
 
 /// Gas represents gas amounts. It's a wrapper around u63. Gas amounts are represented as i64 in tendermint

gears/src/types/auth/info.rs

@@ -9,7 +9,7 @@ use super::{
 };
 
 pub mod inner {
-    pub use core_types::auth::info::AuthInfo;
+    pub use core_types::auth::AuthInfo;
 }
 
 /// AuthInfo describes the fee and signer modes that are used to sign a

gears/src/types/auth/tip.rs

@@ -11,8 +11,8 @@ use crate::types::{
 };
 
 mod inner {
-    pub use core_types::auth::tip::Tip;
-    pub use core_types::base::coin::Coin;
+    pub use core_types::auth::Tip;
+    pub use core_types::base::Coin;
 }
 
 // Tip is the tip used for meta-transactions.

gears/src/types/base/coin/unsigned.rs

@@ -9,8 +9,8 @@ use crate::types::{base::errors::CoinError, denom::Denom, errors::DenomError};
 use super::Coin;
 
 pub mod inner {
-    pub use core_types::base::coin::Coin;
-    pub use core_types::base::coin::IntProto;
+    pub use core_types::base::Coin;
+    pub use core_types::base::IntProto;
 }
 
 /// Coin defines a token with a denomination and an amount.

gears/src/types/msg/send.rs

@@ -8,7 +8,7 @@ use crate::types::{
 };
 
 mod inner {
-    pub use core_types::base::coin::Coin;
+    pub use core_types::base::Coin;
     pub use core_types::msg::MsgSend;
 }