import appropriate traits

SpringQL · Apr 26, 2023 · a08d0bf · a08d0bf
1 parent 03861ad
commit a08d0bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.../src/stream_engine/autonomous_executor/row/foreign_row/source_row/can_frame_source_row.rs b/.../src/stream_engine/autonomous_executor/row/foreign_row/source_row/can_frame_source_row.rs
@@ -1,6 +1,6 @@
 // This file is part of https://github.com/SpringQL/SpringQL which is licensed under MIT OR Apache-2.0. See file LICENSE-MIT or LICENSE-APACHE for full license details.
 
-use socketcan::CanFrame;
+use socketcan::{CanFrame, EmbeddedFrame, Frame};
 
 use crate::{
     api::error::Result,
@@ -31,7 +31,7 @@ impl CANFrameSourceRow {
         let can_frame = self.0;
         let mut column_values = ColumnValues::default();
 
-        let can_id_value = SqlValue::NotNull(NnSqlValue::UnsignedInteger(can_frame.id()));
+        let can_id_value = SqlValue::NotNull(NnSqlValue::UnsignedInteger(can_frame.raw_id()));
         column_values
             .insert(ColumnName::new("can_id".to_string()), can_id_value)
             .expect("can_id must not duplicate");

diff --git a/springql-core/src/stream_engine/autonomous_executor/task/source_task/source_reader/can.rs b/springql-core/src/stream_engine/autonomous_executor/task/source_task/source_reader/can.rs
@@ -3,7 +3,7 @@
 use std::time::Duration;
 
 use anyhow::{anyhow, Context};
-use socketcan::{CanFrame, CanSocket, ShouldRetry};
+use socketcan::{CanFrame, CanSocket, EmbeddedFrame, Frame, ShouldRetry, Socket};
 
 use crate::{
     api::{
@@ -97,7 +97,7 @@ impl CANSourceReader {
             unimplemented!("RTR (remote transmission request) frames are not supported");
         } else if frame.is_extended() {
             unimplemented!("Extended frame format is not supported");
-        } else if frame.is_error() {
+        } else if frame.is_error_frame() {
             Err(SpringError::ForeignIo {
                 source: anyhow!("got a error CAN frame (CAN ID: {})", frame.id()),
                 foreign_info: ForeignInfo::SocketCAN(self.interface.clone()),
@@ -124,7 +124,7 @@ mod tests {
         let can_id = 1;
         let can_data = &[0x00u8, 0x01];
 
-        let frame = CANFrame::new(can_id, can_data, false, false).unwrap();
+        let frame = CanFrame::new(can_id, can_data).unwrap();
         let source_row = CANSourceReader::_can_frame_into_row(frame);
         let row = SchemalessRow::try_from(source_row).unwrap();