Refactor

nodenet/src/conn.rs

@@ -236,7 +236,7 @@ async fn events_conn_handler_inner_try(
     }
 
     let mut stream: Pin<Box<dyn Stream<Item = Box<dyn Framable + Send>> + Send>> =
-        if let AggKind::EventBlobs = evq.agg_kind() {
+        if let AggKind::EventBlobs = evq.agg_kind_value() {
             match disk::raw::conn::make_event_blobs_pipe(&evq, node_config).await {
                 Ok(stream) => {
                     let stream = stream.map(|x| Box::new(x) as _);

nodenet/src/conn/test.rs

@@ -60,7 +60,13 @@ fn raw_data_00() {
             beg: SEC,
             end: SEC * 10,
         };
-        let qu = PlainEventsQuery::new(channel, range, AggKind::Plain, Duration::from_millis(10000), None, true);
+        let qu = PlainEventsQuery::new(
+            channel,
+            range,
+            Some(AggKind::Plain),
+            Some(Duration::from_millis(10000)),
+            None,
+        );
         let query = EventQueryJsonStringFrame(serde_json::to_string(&qu).unwrap());
         let item = Ok(StreamItem::DataItem(RangeCompletableItem::Data(query)));
         let frame = make_frame(&item).unwrap();