[Merged by Bors] - chore: remove unnecessary dep in controlplane-metadata

crates/fluvio-controlplane-metadata/src/lib.rs

@@ -2,9 +2,9 @@ pub mod spu;
 pub mod topic;
 pub mod partition;
 pub mod spg;
-pub mod message;
 pub mod smartmodule;
 pub mod tableformat;
+pub mod message;
 
 pub use fluvio_stream_model::core;
 

crates/fluvio-controlplane-metadata/src/message/messages.rs

@@ -8,7 +8,7 @@ use std::fmt::Debug;
 
 use fluvio_protocol::{Encoder, Decoder};
 
-use super::Message;
+use super::msg_type::Message;
 
 #[derive(Encoder, Decoder, Debug, Eq, PartialEq, Clone, Default)]
 pub struct Messages<S> {

crates/fluvio-controlplane-metadata/src/message/mod.rs

@@ -1,32 +1,5 @@
-mod msg_type;
-mod replica_msg;
 mod messages;
+mod msg_type;
 
-pub use self::msg_type::MsgType;
-pub use self::msg_type::Message;
 pub use messages::*;
-
-pub use self::replica_msg::{ReplicaMsgs, ReplicaMsg};
-pub use self::smartmodule_msg::{SmartModuleMsgs, SmartModuleMsg};
-
-pub use spu_msg::*;
-pub use smartmodule_msg::*;
-
-mod spu_msg {
-
-    use crate::spu::SpuSpec;
-
-    use super::Message;
-
-    pub type SpuMsg = Message<SpuSpec>;
-}
-
-mod smartmodule_msg {
-
-    use crate::smartmodule::SmartModule;
-
-    use super::{Message, Messages};
-
-    pub type SmartModuleMsg = Message<SmartModule>;
-    pub type SmartModuleMsgs = Messages<SmartModule>;
-}
+pub use msg_type::*;

crates/fluvio-controlplane-metadata/src/message/msg_type.rs

@@ -10,10 +10,10 @@ use std::fmt::Display;
 use std::fmt;
 
 use fluvio_protocol::{Encoder, Decoder};
-
-use crate::store::actions::*;
-use crate::core::*;
-use crate::store::*;
+use fluvio_stream_model::core::MetadataItem;
+use fluvio_stream_model::core::Spec;
+use fluvio_stream_model::store::MetadataStoreObject;
+use fluvio_stream_model::store::actions::LSChange;
 
 #[derive(Decoder, Default, Encoder, Debug, Eq, PartialEq, Clone)]
 pub enum MsgType {
@@ -56,17 +56,6 @@ impl<C> Message<C> {
     }
 }
 
-/*
-impl<C> From<C> for Message<C>
-where
-    C: Encoder + Decoder + Debug + Default,
-{
-    fn from(content: C) -> Message<C> {
-        Message::update(content)
-    }
-}
-*/
-
 impl<S, C, D> From<LSChange<S, C>> for Message<D>
 where
     S: Spec,

crates/fluvio-controlplane-metadata/src/partition/mod.rs

@@ -1,14 +1,9 @@
 mod spec;
 mod status;
-mod policy;
-mod replica;
-pub mod store;
 
 pub use self::spec::*;
 pub use self::status::*;
 pub use fluvio_protocol::record::ReplicaKey;
-pub use self::policy::*;
-pub use self::replica::*;
 
 #[cfg(feature = "k8")]
 mod k8;