refactor: minor thing

Author: dpc

crates/module/src/module.rs

@@ -71,14 +71,16 @@ pub enum ModuleInitError {
 
 pub type ModuleInitResult<T> = Result<T, ModuleInitError>;
 
+pub type ModuleSupportedConsensusVersions = BTreeMap<ConsensusVersionMajor, ConsensusVersionMinor>;
+
 /// Module "constructor"
 #[async_trait]
 pub trait ModuleInit: Any {
     fn kind(&self) -> ModuleKind;
 
     /// All major consensus version supported by the module, with latest
     /// supported minor version for each
-    fn supported_versions(&self) -> BTreeMap<ConsensusVersionMajor, ConsensusVersionMinor>;
+    fn supported_versions(&self) -> ModuleSupportedConsensusVersions;
 
     /// Create an instance of module for given arguments
     ///

crates/modules/app-consensus/src/module.rs

@@ -14,7 +14,7 @@ use bfte_module::module::config::ModuleConfig;
 use bfte_module::module::db::{
     DbResult, DbTxResult, ModuleDatabase, ModuleReadableTransaction, ModuleWriteTransactionCtx,
 };
-use bfte_module::module::{DynModuleInit, IModule};
+use bfte_module::module::{IModule, ModuleSupportedConsensusVersions};
 use bfte_util_db::redb_bincode::ReadableTable as _;
 use bfte_util_error::{Whatever, WhateverResult};
 use snafu::{OptionExt as _, ResultExt as _, whatever};
@@ -597,7 +597,7 @@ impl AppConsensusModule {
 
     pub async fn record_module_init_versions(
         &self,
-        modules_inits: &BTreeMap<ModuleKind, DynModuleInit>,
+        modules_supported_versions: &BTreeMap<ModuleKind, ModuleSupportedConsensusVersions>,
     ) {
         let module_configs = self.get_modules_configs().await;
 
@@ -607,11 +607,12 @@ impl AppConsensusModule {
                     dbtx.open_table(&tables::pending_modules_versions_votes::TABLE)?;
 
                 for (module_id, module_config) in module_configs {
-                    let module_init = modules_inits.get(&module_config.kind).unwrap_or_else(|| {
-                        panic!("Missing module init for kind: {}", module_config.kind)
-                    });
+                    let supported_versions = modules_supported_versions
+                        .get(&module_config.kind)
+                        .unwrap_or_else(|| {
+                            panic!("Missing module supported versions for kind: {}", module_config.kind)
+                        });
 
-                    let supported_versions = module_init.supported_versions();
                     let current_major = module_config.version.major();
 
                     let max_minor = supported_versions.get(&current_major).unwrap_or_else(|| {

crates/node-app/src/lib.rs

@@ -29,7 +29,7 @@ use bfte_db::error::DbResult;
 use bfte_module::effect::{EffectKind as _, EffectKindExt as _, ModuleCItemEffect};
 use bfte_module::module::config::ModuleConfig;
 use bfte_module::module::db::{ModuleDatabase, ModuleWriteTransactionCtx};
-use bfte_module::module::{DynModuleInit, DynModuleWithConfig, ModuleInit, ModuleInitArgs};
+use bfte_module::module::{DynModuleInit, DynModuleWithConfig, ModuleInit, ModuleInitArgs, ModuleSupportedConsensusVersions};
 use bfte_module_app_consensus::effects::ConsensusParamsChange;
 use bfte_module_app_consensus::{AppConsensusModule, AppConsensusModuleInit};
 use bfte_node_app_core::NodeAppApi;
@@ -252,10 +252,16 @@ impl NodeApp {
     }
 
     async fn record_modules_versions(&self) {
+        // Collect supported versions from all module inits
+        let mut modules_supported_versions = BTreeMap::new();
+        for (module_kind, module_init) in &self.modules_inits {
+            modules_supported_versions.insert(*module_kind, module_init.supported_versions());
+        }
+
         let modules_read = self.modules.read().await;
         let app_consensus = self.get_app_consensus_module(&modules_read);
         app_consensus
-            .record_module_init_versions(&self.modules_inits)
+            .record_module_init_versions(&modules_supported_versions)
             .await;
     }
     async fn setup_modules_to(