Merge branch 'nightly' into dub/archival_storage

Sovereign-Labs · Nov 21, 2023 · ab46a03 · ab46a03
2 parents 1bd0ade + d624e21
commit ab46a03
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/module-system/module-implementations/sov-chain-state/src/lib.rs b/module-system/module-implementations/sov-chain-state/src/lib.rs
@@ -208,6 +208,15 @@ impl<C: sov_modules_api::Context, Da: sov_modules_api::DaSpec> sov_modules_api::
 
     type Event = ();
 
+    fn call(
+        &self,
+        _msg: Self::CallMessage,
+        _context: &Self::Context,
+        _working_set: &mut WorkingSet<C>,
+    ) -> Result<sov_modules_api::CallResponse, Error> {
+        Ok(sov_modules_api::CallResponse {})
+    }
+
     fn genesis(&self, config: &Self::Config, working_set: &mut WorkingSet<C>) -> Result<(), Error> {
         // The initialization logic
         Ok(self.init_module(config, working_set)?)

diff --git a/module-system/sov-modules-api/src/reexport_macros.rs b/module-system/sov-modules-api/src/reexport_macros.rs
@@ -19,9 +19,8 @@ pub use sov_modules_macros::MessageCodec;
 /// ```
 /// use std::marker::PhantomData;
 ///
-/// use sov_modules_api::{Context, Module, ModuleInfo, ModuleCallJsonSchema, StateMap};
+/// use sov_modules_api::{WorkingSet,Error, CallResponse, Context, Module, ModuleInfo, ModuleCallJsonSchema, StateMap};
 /// use sov_modules_api::default_context::ZkDefaultContext;
-/// use sov_bank::CallMessage;
 ///
 /// #[derive(ModuleInfo, ModuleCallJsonSchema)]
 /// struct TestModule<C: Context> {
@@ -35,8 +34,17 @@ pub use sov_modules_macros::MessageCodec;
 /// impl<C: Context> Module for TestModule<C> {
 ///     type Context = C;
 ///     type Config = PhantomData<C>;
-///     type CallMessage = CallMessage<C>;
+///     type CallMessage = ();
 ///     type Event = ();
+///     
+///     fn call(
+///        &self,
+///        _msg: Self::CallMessage,
+///        _context: &Self::Context,
+///        _working_set: &mut WorkingSet<C>,
+///     ) -> Result<CallResponse, Error> {
+///        Ok(CallResponse {})
+///     }
 /// }
 ///
 /// println!("JSON Schema: {}", TestModule::<ZkDefaultContext>::json_schema());

diff --git a/module-system/sov-modules-core/src/module/mod.rs b/module-system/sov-modules-core/src/module/mod.rs
@@ -50,9 +50,7 @@ pub trait Module {
         _message: Self::CallMessage,
         _context: &Self::Context,
         _working_set: &mut WorkingSet<Self::Context>,
-    ) -> Result<CallResponse, ModuleError> {
-        unreachable!()
-    }
+    ) -> Result<CallResponse, ModuleError>;
 
     /// Attempts to charge the provided amount of gas from the working set.
     ///

diff --git a/utils/bashtestmd/Cargo.toml b/utils/bashtestmd/Cargo.toml
@@ -13,5 +13,5 @@ autotests = false
 
 [dependencies]
 clap = { workspace = true }
-markdown = "1.0.0-alpha.14"
+markdown = "1.0.0-alpha.15"
 shell-escape = "0.1.5"