Merge branch 'blocks-wip' into use-new-bgp-update-builder-for-synthes…

…izing-bmp-withdrawals
NLnetLabs · Sep 15, 2023 · 4cad1af · 4cad1af
2 parents dbb0510 + b937951
commit 4cad1af
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,17 @@
+name: ci
+
+on:
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose
diff --git a/src/targets/mod.rs b/src/targets/mod.rs
@@ -20,9 +20,7 @@ mod bmp_tcp_out;
 #[cfg(feature = "mqtt")]
 mod mqtt;
 mod null;
-// mod rotoro;
 
-// pub use rotoro::{RotoroCoder, RotoroCommand, WireMsg};
 use tokio::sync::mpsc;
 
 //------------ Target --------------------------------------------------------
@@ -46,8 +44,6 @@ pub enum Target {
     #[serde(rename = "mqtt-out")]
     Mqtt(mqtt::target::Mqtt),
 
-    // #[serde(rename = "rotoro-out")]
-    // Rotoro(rotoro::Target),
     #[serde(rename = "null-out")]
     Null(null::Target),
 }
@@ -65,7 +61,6 @@ impl Target {
             Target::BmpTcpOut(target) => target.run(component, cmd, waitpoint).await,
             #[cfg(feature = "mqtt")]
             Target::Mqtt(target) => target.run(component, cmd, waitpoint).await,
-            // Target::Rotoro(target) => target.run(component, cmd).await,
             Target::Null(target) => target.run(component, cmd, waitpoint).await,
         }
     }

diff --git a/src/units/bmp_in/state_machine/states/dumping.rs b/src/units/bmp_in/state_machine/states/dumping.rs
@@ -897,10 +897,6 @@ mod tests {
     #[ignore = "to do"]
     fn end_of_rib_for_all_pending_peers() {}
 
-    #[test]
-    #[ignore = "to do"]
-    fn peer_down_withdraws_correct_routes() {}
-
     #[tokio::test]
     async fn route_monitoring_invalid_message() {
         // Given

diff --git a/src/units/mod.rs b/src/units/mod.rs
@@ -47,8 +47,6 @@ pub enum Unit {
     #[serde(rename = "filter")]
     Filter(filter::unit::Filter),
 
-    // #[serde(rename = "rotoro-in")]
-    // Rotoro(rotoro::unit::RotoroIn),
     #[serde(rename = "bmp-in")]
     BmpIn(bmp_in::unit::BmpIn),