Get CI Working

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: "CI"
+name: "EVM"
 
 env:
   HARDHAT_VAR_MNEMONIC: "test test test test test test test test test test test junk"

.github/workflows/rust-ci.yml

@@ -0,0 +1,26 @@
+name: Rust
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install latest stable Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        override: true
+
+    - name: Run tests
+      run: |
+        cd ./packages/ciphernode/
+        cargo test

.vscode/extensions.json

@@ -1,3 +1,6 @@
 {
-  "recommendations": ["esbenp.prettier-vscode", "NomicFoundation.hardhat-solidity"]
+  "recommendations": [
+    "esbenp.prettier-vscode",
+    "NomicFoundation.hardhat-solidity"
+  ]
 }

package.json

@@ -21,5 +21,6 @@
     "evm:test": "cd packages/evm && yarn test",
     "evm:coverage": "cd packages/evm && yarn coverage",
     "preinstall": "yarn evm:install"
-  }
+  },
+  "dependencies": {}
 }

packages/ciphernode/p2p/src/lib.rs

@@ -10,7 +10,6 @@ use std::hash::{Hash, Hasher};
 use std::time::Duration;
 use tokio::{io, io::AsyncBufReadExt, select};
 use tracing_subscriber::EnvFilter;
-use bfv::EnclaveBFV;
 
 #[derive(NetworkBehaviour)]
 struct MyBehaviour {
@@ -48,7 +47,7 @@ impl EnclaveRouter {
     	self.identity = Some(keypair);
     }
 
-    pub fn connect_swarm(&mut self, discovery_type: String) -> Result<(&Self), Box<dyn Error>> {
+    pub fn connect_swarm(&mut self, discovery_type: String) -> Result<&Self, Box<dyn Error>> {
     	match discovery_type.as_str() {
     		"mdns" => {
 			    let _ = tracing_subscriber::fmt()
@@ -80,14 +79,14 @@ impl EnclaveRouter {
 		    },
     		_ => println!("Defaulting to MDNS discovery"),
     	}
-    	Ok((self))
+    	Ok(self)
     }
 
-    pub fn join_topic(&mut self, topic_name: &str) -> Result<(&Self), Box<dyn Error>> {
+    pub fn join_topic(&mut self, topic_name: &str) -> Result<&Self, Box<dyn Error>> {
     	let topic = gossipsub::IdentTopic::new(topic_name);
     	self.topic = Some(topic.clone());
     	self.swarm.as_mut().unwrap().behaviour_mut().gossipsub.subscribe(&topic)?;
-    	Ok((self))
+    	Ok(self)
     }
 
     pub async fn start(&mut self) -> Result<(), Box<dyn Error>> {
@@ -138,8 +137,6 @@ impl EnclaveRouter {
 	            }
 	        }
 	    }
-
-	    Ok(())
     }
 }
 

packages/evm/contracts/test/MockCyphernodeRegistry.sol

@@ -20,7 +20,7 @@ contract MockCyphernodeRegistry is ICyphernodeRegistry {
         uint256,
         bytes calldata,
         bytes calldata
-    ) external {}
+    ) external {} // solhint-disable-line no-empty-blocks
 
     function committeePublicKey(
         uint256 e3Id
@@ -54,7 +54,7 @@ contract MockCyphernodeRegistryEmptyKey is ICyphernodeRegistry {
         uint256,
         bytes calldata,
         bytes calldata
-    ) external {}
+    ) external {} // solhint-disable-line no-empty-blocks
 
     function committeePublicKey(uint256) external pure returns (bytes memory) {
         return hex"";

packages/evm/test/Enclave.spec.ts

@@ -696,7 +696,7 @@ describe("Enclave", function () {
         { value: 10 },
       );
 
-      mine(1, { interval: 1000 });
+      const _ = mine(1, { interval: 1000 });
 
       await expect(enclave.activate(0)).to.be.revertedWithCustomError(
         enclave,
@@ -746,7 +746,7 @@ describe("Enclave", function () {
         { value: 10 },
       );
 
-      mine(1, { interval: 1000 });
+      const _ = mine(1, { interval: 1000 });
 
       await expect(enclave.activate(0)).to.be.revertedWithCustomError(
         enclave,
@@ -954,10 +954,10 @@ describe("Enclave", function () {
 
       await enclave.activate(0);
 
-      expect(await enclave.publishInput(0, inputData)).to.not.be.reverted;
+      await expect(await enclave.publishInput(0, inputData)).to.not.be.reverted;
       let e3 = await enclave.getE3(0);
       expect(e3.inputs[0]).to.equal(inputData);
-      expect(await enclave.publishInput(0, inputData)).to.not.be.reverted;
+      await expect(await enclave.publishInput(0, inputData)).to.not.be.reverted;
       e3 = await enclave.getE3(0);
       expect(e3.inputs[1]).to.equal(inputData);
     });
@@ -1011,7 +1011,7 @@ describe("Enclave", function () {
 
   describe("publishCiphertextOutput()", function () {
     it("reverts if E3 does not exist", async function () {
-      const { enclave, request } = await loadFixture(setup);
+      const { enclave } = await loadFixture(setup);
 
       await expect(enclave.publishCiphertextOutput(0, "0x"))
         .to.be.revertedWithCustomError(enclave, "E3DoesNotExist")
@@ -1173,7 +1173,7 @@ describe("Enclave", function () {
 
   describe("publishPlaintextOutput()", function () {
     it("reverts if E3 does not exist", async function () {
-      const { enclave, request } = await loadFixture(setup);
+      const { enclave } = await loadFixture(setup);
       const e3Id = 0;
 
       await expect(enclave.publishPlaintextOutput(e3Id, "0x"))
@@ -1330,7 +1330,7 @@ describe("Enclave", function () {
       await enclave.activate(e3Id);
       await mine(2, { interval: request.duration });
       await enclave.publishCiphertextOutput(e3Id, "0x1337");
-      expect(await enclave.publishPlaintextOutput(e3Id, "0x1337"))
+      await expect(await enclave.publishPlaintextOutput(e3Id, "0x1337"))
         .to.emit(enclave, "PlaintextOutputPublished")
         .withArgs(e3Id, "0x1337");
     });