Compact the code coverage tasks

There is no need to run twice the tests the same way.

Author: lu-zero

.github/workflows/libp2p-rust-dht.yml

@@ -233,47 +233,6 @@ jobs:
             exit 1
         fi
 
-  weighted-code-coverage:
-
-    needs: [build, docs]
-
-    runs-on: ubuntu-latest
-
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: mysecretpassword
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install protobuf compiler
-      run: |
-        sudo apt-get update
-        sudo apt-get install protobuf-compiler
-
-    - name: Install Rust stable
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        toolchain: stable
-
-    - name: Install grcov
-      env:
-        GRCOV_LINK: https://github.com/mozilla/grcov/releases/download
-        GRCOV_VERSION: v0.8.13
-        GRCOV_BINARY: grcov-x86_64-unknown-linux-musl.tar.bz2
-      run: |
-        curl -L "$GRCOV_LINK/$GRCOV_VERSION/$GRCOV_BINARY" |
-        tar xj -C $HOME/.cargo/bin
-
     - name: Install weighted-code-coverage
       env:
         WCC_LINK: https://github.com/SoftengPoliTo/weighted-code-coverage/releases/download
@@ -283,23 +242,7 @@ jobs:
         curl -L "$WCC_LINK/$WCC_VERSION/$WCC_BINARY" |
         tar xz -C $HOME/.cargo/bin
 
-    - name: Install llvm-tools-preview
-      run: |
-        rustup component add llvm-tools-preview
-
-    # Not necessary on a newly created image, but strictly advised
-    - name: Run cargo clean
-      run: |
-        cargo clean
-
-    - name: Run tests
-      env:
-        RUSTFLAGS: "-Cinstrument-coverage"
-        LLVM_PROFILE_FILE: "libp2p-rust-dht-%p-%m.profraw"
-      run: |
-        cargo test --verbose --all
-
-    - name: Run grcov
+    - name: Run grcov to produce a coveralls json
       run: |
         grcov . --binary-path ./target/debug/ -t coveralls -s . --token YOUR_COVERALLS_TOKEN > coveralls.json
 
@@ -318,7 +261,7 @@ jobs:
 
   audit:
 
-    needs: [code-coverage, weighted-code-coverage]
+    needs: [code-coverage]
 
     runs-on: ubuntu-latest
 
@@ -348,7 +291,7 @@ jobs:
 
   deny:
 
-    needs: [code-coverage, weighted-code-coverage]
+    needs: [code-coverage]
 
     runs-on: ubuntu-latest
 
@@ -394,7 +337,7 @@ jobs:
 
   udeps:
 
-    needs: [code-coverage, weighted-code-coverage]
+    needs: [code-coverage]
 
     runs-on: ubuntu-latest
 

dht-cache/src/cache.rs

@@ -78,9 +78,22 @@ impl Builder {
 pub struct Cache {
     peer_id: String,
     local: LocalCache,
+    peers: Arc<RwLock<PeersState>>,
     cmd: UnboundedSender<Command>,
 }
 
+/// Information regarding the known peers
+pub struct PeerInfo {
+    /// libp2p Identifier
+    pub peer_id: String,
+    /// Hash of its cache of the DHT
+    pub hash: u64,
+    /// Last time the peer updated its state
+    ///
+    /// TODO: use a better type
+    pub last_seen: u128,
+}
+
 impl Cache {
     /// Send a volatile message
     ///
@@ -142,6 +155,11 @@ impl Cache {
     pub fn query(&self, topic: &str) -> Query {
         self.local.query(topic)
     }
+
+    /// Get a list of the current peers
+    pub async fn peers(&self) -> Vec<PeerInfo> {
+        todo!()
+    }
 }
 
 #[derive(Default, Debug, Clone)]
@@ -202,18 +220,19 @@ pub fn cache_channel(
 
     let (cmd, r, _j) = dht_channel(swarm);
 
+    let peers_state = Arc::new(RwLock::new(PeersState::with_interval(
+        resend_interval as u128,
+    )));
+
     let cache = Cache {
+        peers: peers_state.clone(),
         local: local.clone(),
         cmd: cmd.clone(),
         peer_id: local_peer_id.clone(),
     };
 
     let stream = UnboundedReceiverStream::new(r);
 
-    let peers_state = Arc::new(RwLock::new(PeersState::with_interval(
-        resend_interval as u128,
-    )));
-
     let local_read = local.clone();
     let cmd_update = cmd.clone();
     let peer_id = local_peer_id.clone();