Modules: export all public types from query module in lib.rs.

examples/demo-nft-module/src/lib.rs

@@ -7,7 +7,7 @@ mod genesis;
 #[cfg(feature = "native")]
 mod query;
 #[cfg(feature = "native")]
-pub use query::{NonFungibleTokenRpcImpl, NonFungibleTokenRpcServer, OwnerResponse};
+pub use query::*;
 use sov_modules_api::{CallResponse, Context, Error, Module, ModuleInfo};
 use sov_state::WorkingSet;
 

examples/demo-rollup/tests/bank/mod.rs

@@ -54,7 +54,7 @@ async fn send_test_create_token_tx(rpc_address: SocketAddr) -> Result<(), anyhow
     // Wait until the rollup has processed the next slot
     let _ = slot_processed_subscription.next().await;
 
-    let balance_response = sov_bank::query::BankRpcClient::<DefaultContext>::balance_of(
+    let balance_response = sov_bank::BankRpcClient::<DefaultContext>::balance_of(
         client.http(),
         user_address,
         token_address,

examples/demo-stf/src/runtime.rs

@@ -1,14 +1,14 @@
 #[cfg(feature = "native")]
-use sov_accounts::query::{AccountsRpcImpl, AccountsRpcServer};
+use sov_accounts::{AccountsRpcImpl, AccountsRpcServer};
 #[cfg(feature = "native")]
-use sov_bank::query::{BankRpcImpl, BankRpcServer};
+use sov_bank::{BankRpcImpl, BankRpcServer};
 #[cfg(feature = "native")]
 use sov_blob_storage::{BlobStorageRpcImpl, BlobStorageRpcServer};
 #[cfg(feature = "native")]
 use sov_chain_state::{ChainStateRpcImpl, ChainStateRpcServer};
 #[cfg(feature = "native")]
 #[cfg(feature = "experimental")]
-use sov_evm::query::{EvmRpcImpl, EvmRpcServer};
+use sov_evm::{EvmRpcImpl, EvmRpcServer};
 use sov_modules_api::capabilities::{BlobRefOrOwned, BlobSelector};
 #[cfg(feature = "native")]
 pub use sov_modules_api::default_context::DefaultContext;
@@ -20,16 +20,7 @@ use sov_rollup_interface::da::DaSpec;
 #[cfg(feature = "native")]
 use sov_sequencer_registry::{SequencerRegistryRpcImpl, SequencerRegistryRpcServer};
 #[cfg(feature = "native")]
-use sov_value_setter::query::{ValueSetterRpcImpl, ValueSetterRpcServer};
-
-#[cfg(feature = "native")]
-pub mod query {
-    pub use sov_accounts::query as accounts;
-    pub use sov_bank::query as bank;
-    pub use sov_chain_state::query as chain_state;
-    pub use sov_sequencer_registry::query as sequencer_registry;
-    pub use sov_value_setter::query as value_setter;
-}
+use sov_value_setter::{ValueSetterRpcImpl, ValueSetterRpcServer};
 
 /// The Rollup entrypoint.
 ///

examples/demo-stf/src/tests/stf_tests.rs

@@ -65,14 +65,11 @@ pub mod test {
                 .bank
                 .supply_of(get_default_token_address(), &mut working_set)
                 .unwrap();
-            assert_eq!(
-                resp,
-                sov_bank::query::TotalSupplyResponse { amount: Some(1000) }
-            );
+            assert_eq!(resp, sov_bank::TotalSupplyResponse { amount: Some(1000) });
 
             let resp = runtime.value_setter.query_value(&mut working_set).unwrap();
 
-            assert_eq!(resp, sov_value_setter::query::Response { value: Some(33) });
+            assert_eq!(resp, sov_value_setter::Response { value: Some(33) });
         }
     }
 
@@ -119,14 +116,11 @@ pub mod test {
             .bank
             .supply_of(get_default_token_address(), &mut working_set)
             .unwrap();
-        assert_eq!(
-            resp,
-            sov_bank::query::TotalSupplyResponse { amount: Some(1000) }
-        );
+        assert_eq!(resp, sov_bank::TotalSupplyResponse { amount: Some(1000) });
 
         let resp = runtime.value_setter.query_value(&mut working_set).unwrap();
 
-        assert_eq!(resp, sov_value_setter::query::Response { value: Some(33) });
+        assert_eq!(resp, sov_value_setter::Response { value: Some(33) });
     }
 
     #[test]
@@ -174,14 +168,11 @@ pub mod test {
                 .bank
                 .supply_of(get_default_token_address(), &mut working_set)
                 .unwrap();
-            assert_eq!(
-                resp,
-                sov_bank::query::TotalSupplyResponse { amount: Some(1000) }
-            );
+            assert_eq!(resp, sov_bank::TotalSupplyResponse { amount: Some(1000) });
 
             let resp = runtime.value_setter.query_value(&mut working_set).unwrap();
 
-            assert_eq!(resp, sov_value_setter::query::Response { value: None });
+            assert_eq!(resp, sov_value_setter::Response { value: None });
         }
     }
 

examples/demo-stf/src/tests/tx_revert_tests.rs

@@ -1,4 +1,4 @@
-use sov_accounts::query::Response;
+use sov_accounts::Response;
 use sov_data_generators::bank_data::{get_default_private_key, get_default_token_address};
 use sov_data_generators::{has_tx_events, new_test_blob_from_batch};
 use sov_modules_api::default_context::DefaultContext;

module-system/module-implementations/examples/sov-accessory-state/src/lib.rs

@@ -2,8 +2,10 @@
 #![doc = include_str!("../README.md")]
 
 #[cfg(feature = "native")]
-pub mod query;
+mod query;
 
+#[cfg(feature = "native")]
+pub use query::*;
 use sov_modules_api::{CallResponse, Context, Error, Module, ModuleInfo};
 use sov_state::{AccessoryStateValue, StateValue, WorkingSet};
 

module-system/module-implementations/examples/sov-value-setter/src/lib.rs

@@ -7,9 +7,11 @@ mod genesis;
 mod tests;
 
 #[cfg(feature = "native")]
-pub mod query;
+mod query;
 
 pub use call::CallMessage;
+#[cfg(feature = "native")]
+pub use query::*;
 use sov_modules_api::{Error, ModuleInfo};
 use sov_state::WorkingSet;