Pass on stm module

.github/workflows/ci.yml

@@ -139,22 +139,6 @@ jobs:
         run: |
           set -o pipefail && cargo test --release -- -Z unstable-options --format json --report-time | tee >(cargo2junit > test-results-mithril-core.xml)
 
-      - name: Set up Clang
-        uses: egor-tensin/setup-clang@v1
-        with:
-          version: latest
-          platform: x64
-
-      - name: Install gtest manually
-        run: sudo apt-get install libgtest-dev && cd /usr/src/gtest && sudo cmake CMakeLists.txt && sudo make && sudo cp lib/*.a /usr/lib && sudo ln -s /usr/lib/libgtest.a /usr/local/lib/libgtest.a && sudo ln -s /usr/lib/libgtest_main.a /usr/local/lib/libgtest_main.a
-
-      - name: Build C test
-        run: clang -x c++ tests.c stms.c -g -o tests -L ../target/release -lmithril -lpthread -lstdc++ -lgtest -lgtest_main
-        working-directory: mithril-core/c-tests
-
-      - name: Run C test
-        run: LD_LIBRARY_PATH=../target/release ./tests --gtest_output=xml:test-results-ctest-mithril-core.xml
-        working-directory: mithril-core/c-tests
 
       - name: Upload Unit Test Results
         if: always()

demo/protocol-demo/src/demonstrator.rs

@@ -165,7 +165,11 @@ impl Party {
     /// Verify a certificate
     pub fn verify_message(&self, message: &Bytes) -> Result<(), String> {
         match self.get_aggregate(message) {
-            Some(msig) => match self.clerk.as_ref().unwrap().verify_msig(msig, message) {
+            Some(msig) => match msig.verify(
+                message,
+                &self.clerk.as_ref().unwrap().compute_avk(),
+                &self.params.unwrap(),
+            ) {
                 Ok(_) => {
                     println!(
                         "Party #{}: aggregate signature successfully verified for {}!",
@@ -253,7 +257,11 @@ impl Verifier {
         message: &Bytes,
         msig: &ProtocolMultiSignature,
     ) -> Result<(), String> {
-        match self.clerk.as_ref().unwrap().verify_msig(msig, message) {
+        match msig.verify(
+            message,
+            &self.clerk.as_ref().unwrap().compute_avk(),
+            &self.params.unwrap(),
+        ) {
             Ok(_) => {
                 println!(
                     "Verifier: aggregate signature successfully verified for {}!",

mithril-aggregator/src/multi_signer.rs

@@ -241,7 +241,8 @@ impl MultiSigner for MultiSignerImpl {
             .get_current_message()
             .ok_or_else(ProtocolError::UnavailableMessage)?;
         let clerk = self.clerk();
-        match clerk.verify_sig(signature, message) {
+        let avk = clerk.compute_avk();
+        match signature.verify(&self.protocol_parameters.unwrap(), &avk, message) {
             Ok(_) => {
                 // Register single signature
                 self.single_signatures

mithril-client/src/verifier.rs

@@ -45,7 +45,7 @@ impl VerifierImpl {
         &self,
         signers_with_stakes: &[entities::SignerWithStake],
         protocol_parameters: &entities::ProtocolParameters,
-    ) -> Result<ProtocolClerk, String> {
+    ) -> Result<ProtocolClerk, ProtocolError> {
         let stakes = signers_with_stakes
             .iter()
             .map(|signer| {
@@ -87,13 +87,16 @@ impl Verifier for VerifierImpl {
         protocol_parameters: &entities::ProtocolParameters,
     ) -> Result<(), ProtocolError> {
         debug!("Verify multi signature for {:?}", message);
-        let clerk = self.create_clerk(signers_with_stakes, protocol_parameters);
         let multi_signature: ProtocolMultiSignature =
             key_decode_hex(multi_signature).map_err(ProtocolError::VerifyMultiSignatureError)?;
-        clerk
-            .as_ref()
-            .unwrap()
-            .verify_msig(&multi_signature, message)
+        multi_signature
+            .verify(
+                message,
+                &self
+                    .create_clerk(signers_with_stakes, protocol_parameters)?
+                    .compute_avk(),
+                &protocol_parameters.to_owned().into(),
+            )
             .map_err(|e| ProtocolError::VerifyMultiSignatureError(e.to_string()))
     }
 }

mithril-common/src/crypto_helper/types.rs

@@ -1,7 +1,7 @@
 use mithril::key_reg::KeyReg;
 use mithril::stm::{
-    Index, PartyId, Stake, StmClerk, StmInitializer, StmMultiSig, StmParameters, StmSig, StmSigner,
-    StmVerificationKey,
+    Index, PartyId, Stake, StmAggrSig, StmClerk, StmInitializer, StmParameters, StmSig, StmSigner,
+    StmVerificationKeyPoP,
 };
 
 use super::super::entities;
@@ -20,8 +20,8 @@ pub type ProtocolInitializer = StmInitializer;
 pub type ProtocolClerk = StmClerk<D>;
 pub type ProtocolKeyRegistration = KeyReg;
 pub type ProtocolSingleSignature = StmSig<D>;
-pub type ProtocolMultiSignature = StmMultiSig<D>;
-pub type ProtocolSignerVerificationKey = StmVerificationKey;
+pub type ProtocolMultiSignature = StmAggrSig<D>;
+pub type ProtocolSignerVerificationKey = StmVerificationKeyPoP;
 
 impl From<ProtocolParameters> for entities::ProtocolParameters {
     fn from(other: ProtocolParameters) -> Self {

mithril-core/benches/stm.rs

@@ -178,7 +178,7 @@ where
     let clerk = StmClerk::from_signer(&party_dummy);
     let msig = clerk.aggregate(&sigs, &msg).unwrap();
     group.bench_function("Verification", |b| {
-        b.iter(|| clerk.verify_msig(&msig, &msg).is_ok())
+        b.iter(|| msig.verify(&msg, &clerk.compute_avk(), &params).is_ok())
     });
 }