WIP

disk/src/channelconfig.rs

@@ -1,18 +1,15 @@
 use err::Error;
 use netpod::range::evrange::NanoRange;
 use netpod::Channel;
-use netpod::ChannelConfig;
 use netpod::NodeConfigCached;
 use parse::channelconfig::extract_matching_config_entry;
 use parse::channelconfig::read_local_config;
 use parse::channelconfig::ChannelConfigs;
 use parse::channelconfig::MatchingConfigEntry;
 
-pub async fn config(
-    range: NanoRange,
-    channel: Channel,
-    node_config: &NodeConfigCached,
-) -> Result<ChannelConfig, Error> {
+use crate::SfDbChConf;
+
+pub async fn config(range: NanoRange, channel: Channel, node_config: &NodeConfigCached) -> Result<SfDbChConf, Error> {
     let channel_configs = read_local_config(channel.clone(), node_config.node.clone()).await?;
     let entry_res = match extract_matching_config_entry(&range, &channel_configs) {
         Ok(k) => k,
@@ -37,7 +34,7 @@ pub async fn config(
         Ok(k) => k,
         Err(e) => return Err(e)?,
     };
-    let channel_config = ChannelConfig {
+    let channel_config = SfDbChConf {
         channel: channel.clone(),
         keyspace: entry.ks as u8,
         time_bin_size: entry.bs.clone(),