fix: move macro to macro.rs

nomad-base/src/agent.rs

@@ -2,8 +2,7 @@ use crate::{
     cancel_task,
     metrics::CoreMetrics,
     settings::{IndexSettings, Settings},
-    BaseError, CachingHome, CachingReplica, ChannelBase, ContractSyncMetrics, IndexDataTypes,
-    NomadDB,
+    BaseError, CachingHome, CachingReplica, ContractSyncMetrics, IndexDataTypes, NomadDB,
 };
 use async_trait::async_trait;
 use color_eyre::{eyre::WrapErr, Result};
@@ -36,6 +35,17 @@ pub struct AgentCore {
     pub settings: crate::settings::Settings,
 }
 
+#[derive(Debug, Clone)]
+/// Commmon data needed for a single agent channel
+pub struct ChannelBase {
+    /// Home
+    pub home: Arc<CachingHome>,
+    /// Replica
+    pub replica: Arc<CachingReplica>,
+    /// NomadDB keyed by home
+    pub db: NomadDB,
+}
+
 /// A trait for an application:
 ///      that runs on a replica
 /// and:

nomad-base/src/lib.rs

@@ -16,9 +16,6 @@ pub use settings::*;
 mod agent;
 pub use agent::*;
 
-mod channel;
-pub use channel::*;
-
 #[doc(hidden)]
 #[cfg_attr(tarpaulin, skip)]
 #[macro_use]

nomad-base/src/macros.rs

@@ -43,6 +43,57 @@ macro_rules! decl_agent {
     };
 }
 
+#[macro_export]
+/// Declare a new channel block
+/// ### Usage
+///
+/// ```ignore
+/// decl_channel!(Relayer {
+///     updates_relayed_counts: prometheus::IntCounterVec,
+///     interval: u64,
+/// });
+
+/// ```
+macro_rules! decl_channel {
+    (
+        $name:ident {
+            $($(#[$tags:meta])* $prop:ident: $type:ty,)*
+        }
+    ) => {
+        paste::paste! {
+            #[derive(Debug, Clone)]
+            #[doc = "Channel for `" $name]
+            pub struct [<$name Channel>] {
+                pub(crate) base: nomad_base::ChannelBase,
+                $(
+                    $(#[$tags])*
+                    pub(crate) $prop: $type,
+                )*
+            }
+
+            impl AsRef<nomad_base::ChannelBase> for [<$name Channel>] {
+                fn as_ref(&self) -> &nomad_base::ChannelBase {
+                    &self.base
+                }
+            }
+
+            impl [<$name Channel>] {
+                pub fn home(&self) -> Arc<CachingHome> {
+                    self.as_ref().home.clone()
+                }
+
+                pub fn replica(&self) -> Arc<CachingReplica> {
+                    self.as_ref().replica.clone()
+                }
+
+                pub fn db(&self) -> nomad_base::NomadDB {
+                    self.as_ref().db.clone()
+                }
+            }
+        }
+    }
+}
+
 #[macro_export]
 /// Declare a new settings block
 ///