Merge branch 'tetanus' into tetanus-noise-xk

.github/workflows/build.yml

@@ -20,8 +20,14 @@ jobs:
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
         restore-keys: ${{ runner.os }}-cargo-
 
-    - name: make
+    - name: cargo fmt
-      run: make
+      run: cargo fmt --all -- --check
+        
+    - name: cargo build
+      run: cargo build
+
+    - name: cargo test
+      run: cargo test
 
   build_macos:
     runs-on: macos-latest
@@ -42,52 +48,14 @@ jobs:
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
         restore-keys: ${{ runner.os }}-cargo-
 
-    - name: make
+    - name: cargo fmt
-      run: make
+      run: cargo fmt --all -- --check
-
+        
-  test_ubuntu:
+    - name: cargo build
-    runs-on: ubuntu-latest
+      run: cargo build
-    steps:
-    - name: checkout
-      uses: actions/checkout@v3
-
-    - name: Set up cargo cache
-      uses: actions/cache@v3
-      continue-on-error: false
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
 
     - name: cargo test
-      run: cargo test -v
+      run: cargo test
-
-  test_macos:
-    runs-on: macos-latest
-    steps:
-    - name: checkout
-      uses: actions/checkout@v3
-
-    - name: Set up cargo cache
-      uses: actions/cache@v3
-      continue-on-error: false
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
-
-    - name: cargo test
-      run: cargo test -v
 
   # build_windows:
   #   runs-on: windows-latest

README.md

@@ -10,11 +10,3 @@ DO NOT expect this code to work or be useful for anything yet. Also note that it
 Eventually the plan is that this repository will be merged back into the main repo as a branch and then this branch will become the new release, replacing the current v1 code base. Until then, feel free to look around.
 
 Once again: do not expect this to be done and do not try to post bug reports about it. It's very much under construction.
-
-=)
-=)
-=)
-=)
-=)
-=)
-=)

controller/src/postgresdatabase.rs

@@ -193,7 +193,7 @@ impl VL1DataStorage for PostgresDatabase {
         Some(self.local_identity.clone())
     }
 
-    fn save_node_identity(&self, id: &Valid<Identity>) -> bool {
+    fn save_node_identity(&self, _id: &Valid<Identity>) -> bool {
         panic!("local identity saving not supported by PostgresDatabase")
     }
 }
@@ -389,7 +389,7 @@ impl Database for PostgresDatabase {
         }))
     }
 
-    async fn save_network(&self, obj: Network, generate_change_notification: bool) -> Result<(), Error> {
+    async fn save_network(&self, _obj: Network, _generate_change_notification: bool) -> Result<(), Error> {
         todo!()
     }
 
@@ -405,11 +405,11 @@ impl Database for PostgresDatabase {
         Ok(r)
     }
 
-    async fn get_member(&self, network_id: NetworkId, node_id: Address) -> Result<Option<Member>, Error> {
+    async fn get_member(&self, _network_id: NetworkId, _node_id: Address) -> Result<Option<Member>, Error> {
         todo!()
     }
 
-    async fn save_member(&self, obj: Member, generate_change_notification: bool) -> Result<(), Error> {
+    async fn save_member(&self, _obj: Member, _generate_change_notification: bool) -> Result<(), Error> {
         todo!()
     }
 
@@ -443,7 +443,7 @@ impl Database for PostgresDatabase {
         return Ok(false);
     }
 
-    async fn log_request(&self, obj: RequestLogItem) -> Result<(), Error> {
+    async fn log_request(&self, _obj: RequestLogItem) -> Result<(), Error> {
         todo!()
     }
 }

network-hypervisor/src/vl1/peer.rs

@@ -784,7 +784,7 @@ impl Peer {
         inner: &Inner,
         node: &Node,
         time_ticks: i64,
-        message_id: MessageId,
+        _message_id: MessageId,
         payload: &PacketBuffer,
     ) -> PacketHandlerResult {
         if node.this_node_is_root() || inner.should_respond_to(&self.identity) {
@@ -813,12 +813,12 @@ impl Peer {
 
     fn handle_incoming_rendezvous<Application: ApplicationLayer + ?Sized>(
         self: &Arc<Self>,
-        app: &Application,
+        _app: &Application,
         node: &Node,
-        time_ticks: i64,
+        _time_ticks: i64,
-        message_id: MessageId,
+        _message_id: MessageId,
-        source_path: &Arc<Path>,
+        _source_path: &Arc<Path>,
-        payload: &PacketBuffer,
+        _payload: &PacketBuffer,
     ) -> PacketHandlerResult {
         if node.is_peer_root(self) {}
         return PacketHandlerResult::Ok;
@@ -853,22 +853,22 @@ impl Peer {
 
     fn handle_incoming_push_direct_paths<Application: ApplicationLayer + ?Sized>(
         self: &Arc<Self>,
-        app: &Application,
+        _app: &Application,
-        node: &Node,
+        _node: &Node,
-        time_ticks: i64,
+        _time_ticks: i64,
-        source_path: &Arc<Path>,
+        _source_path: &Arc<Path>,
-        payload: &PacketBuffer,
+        _payload: &PacketBuffer,
     ) -> PacketHandlerResult {
         PacketHandlerResult::Ok
     }
 
     fn handle_incoming_user_message<Application: ApplicationLayer + ?Sized>(
         self: &Arc<Self>,
-        app: &Application,
+        _app: &Application,
-        node: &Node,
+        _node: &Node,
-        time_ticks: i64,
+        _time_ticks: i64,
-        source_path: &Arc<Path>,
+        _source_path: &Arc<Path>,
-        payload: &PacketBuffer,
+        _payload: &PacketBuffer,
     ) -> PacketHandlerResult {
         PacketHandlerResult::Ok
     }