Update deps (#748)

shotover · Aug 18, 2022 · d9d306e · d9d306e
1 parent d2ca77d
commit d9d306e
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/shotover-proxy/Cargo.toml b/shotover-proxy/Cargo.toml
@@ -78,18 +78,18 @@ generic-array = { version = "0.14", features = ["serde"] }
 rayon = "1.5.1"
 criterion = { git = "https://github.com/shotover/criterion.rs", branch = "version-0.4", version = "0.3", features = ["async_tokio", "html_reports"] }
 redis = { version = "0.21.0", features = ["tokio-comp", "cluster"] }
-pcap = "0.9.0"
+pcap = "0.10.0"
 pktparse = { version = "0.7.0", features = ["serde"] }
 tls-parser = "0.11.0"
 tokio-io-timeout = "1.1.1"
-serial_test = "0.8.0"
+serial_test = "0.9.0"
 cassandra-cpp = "1.1.0"
 test-helpers = { path = "../test-helpers" }
 hex-literal = "0.3.3"
-nix = "0.24.0"
+nix = "0.25.0"
 reqwest = "0.11.6"
 metrics-util = "0.14.0"
-cdrs-tokio = { git = "https://github.com/krojew/cdrs-tokio", rev = "7d6d8fee723a232f17b4173de61e6fd9eb4d4505" }
+cdrs-tokio = { git = "https://github.com/krojew/cdrs-tokio" }
 scylla = { version = "0.4.7", features = ["ssl"] }
 
 [[bench]]

diff --git a/shotover-proxy/tests/cassandra_int_tests/mod.rs b/shotover-proxy/tests/cassandra_int_tests/mod.rs
@@ -492,10 +492,9 @@ async fn test_events_keyspace() {
 
  let mut event_recv = session.create_event_receiver();
 
- sleep(Duration::from_secs(3)).await; // let the driver finish connecting to the cluster and registering for the events
+ sleep(Duration::from_secs(10)).await; // let the driver finish connecting to the cluster and registering for the events
 
  let create_ks = "CREATE KEYSPACE IF NOT EXISTS test_events_ks WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };";
-
  session.query(create_ks).await.unwrap();
 
  let event = timeout(Duration::from_secs(10), event_recv.recv())

diff --git a/shotover-proxy/tests/codec/util/packet_capture.rs b/shotover-proxy/tests/codec/util/packet_capture.rs
@@ -29,7 +29,7 @@ impl PacketCapture {
  pub fn save_to_file(&mut self, mut cap_handle: Capture<Active>, file_name: &str) {
  match cap_handle.savefile(&file_name) {
  Ok(mut file) => {
- while let Ok(packet) = cap_handle.next() {
+ while let Ok(packet) = cap_handle.next_packet() {
  file.write(&packet);
  }
  }
@@ -42,7 +42,7 @@ impl PacketCapture {
  pub fn print_to_console(&mut self, mut cap_handle: Capture<Active>) {
  self.print_headers();
 
- while let Ok(packet) = cap_handle.next() {
+ while let Ok(packet) = cap_handle.next_packet() {
  let packet = OwnedPcapPacket::from(packet);
  let packet_parse = PacketParse::default();
  let parsed_packet = packet_parse.parse_packet(&packet);
@@ -136,7 +136,8 @@ impl PacketCapture {
  }
 
  let packets: Vec<_> =
- std::iter::from_fn(move || cap_handle.next().ok().map(OwnedPcapPacket::from)).collect();
+ std::iter::from_fn(move || cap_handle.next_packet().ok().map(OwnedPcapPacket::from))
+ .collect();
 
  packets
  .par_iter()

diff --git a/test-helpers/Cargo.toml b/test-helpers/Cargo.toml
@@ -12,5 +12,5 @@ tracing = "0.1.15"
 subprocess = "0.2.7"
 anyhow = "1.0.42"
 regex = "1.5.5"
-nix = "0.24.0"
+nix = "0.25.0"
 rcgen = "0.9.2"