Refactor

daqbufp2/src/test/api4/eventsjson.rs

@@ -1,14 +1,18 @@
 use crate::err::ErrConv;
 use crate::nodes::require_test_hosts_running;
 use crate::test::f32_iter_cmp_near;
-use chrono::{DateTime, Utc};
+use chrono::Utc;
 use err::Error;
 use http::StatusCode;
 use hyper::Body;
+use netpod::log::*;
 use netpod::query::PlainEventsQuery;
+use netpod::AppendToUrl;
+use netpod::Channel;
+use netpod::Cluster;
+use netpod::HostPort;
+use netpod::NanoRange;
 use netpod::APP_JSON;
-use netpod::{log::*, AggKind};
-use netpod::{AppendToUrl, Channel, Cluster, HostPort, NanoRange};
 use serde_json::Value as JsonValue;
 use url::Url;
 
@@ -100,10 +104,10 @@ async fn events_plain_json(
 ) -> Result<JsonValue, Error> {
     let t1 = Utc::now();
     let node0 = &cluster.nodes[0];
-    let beg_date: DateTime<Utc> = beg_date.parse()?;
-    let end_date: DateTime<Utc> = end_date.parse()?;
+    let beg_date = beg_date.parse()?;
+    let end_date = end_date.parse()?;
     let range = NanoRange::from_date_time(beg_date, end_date);
-    let query = PlainEventsQuery::new(channel, range, Some(AggKind::TimeWeightedScalar), None, None);
+    let query = PlainEventsQuery::new(channel, range).for_time_weighted_scalar();
     let hp = HostPort::from_node(node0);
     let mut url = Url::parse(&format!("http://{}:{}/api/4/events", hp.host, hp.port))?;
     query.append_to_url(&mut url);