Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 77 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: CI

on:
push:
branches: [main]
pull_request:

env:
CARGO_TERM_COLOR: always

jobs:
fmt:
name: Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: rustup component add rustfmt
- run: cargo fmt --check

clippy:
name: Clippy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: rustup component add clippy
- uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
target
key: clippy-${{ hashFiles('Cargo.lock') }}
- run: cargo clippy --all-features --tests -- -D warnings

build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
target
key: build-${{ hashFiles('Cargo.lock') }}
- run: cargo build --all-features

no-std:
name: Build no-std (wasm32)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: rustup target add wasm32-unknown-unknown
- uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
target
key: wasm-${{ hashFiles('Cargo.lock') }}
- run: cargo build --target wasm32-unknown-unknown --no-default-features

test:
name: Tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
target
key: test-${{ hashFiles('Cargo.lock') }}
- run: cargo test --release --all-features

34 changes: 16 additions & 18 deletions src/demo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl GenerateVerifiable for Trivial {
}

fn member_from_secret(secret: &Self::Secret) -> Self::Member {
secret.clone()
*secret
}

#[cfg(feature = "prover")]
Expand All @@ -69,7 +69,7 @@ impl GenerateVerifiable for Trivial {
if !set.contains(member) {
return Err(());
}
Ok((member.clone(), set))
Ok((*member, set))
}

#[cfg(feature = "prover")]
Expand All @@ -82,7 +82,7 @@ impl GenerateVerifiable for Trivial {
if &member != secret {
return Err(());
}
Ok(((secret.clone()), secret.clone()))
Ok((*secret, *secret))
}

fn validate(
Expand All @@ -92,19 +92,19 @@ impl GenerateVerifiable for Trivial {
_context: &[u8],
_message: &[u8],
) -> Result<Alias, ()> {
if members.contains(&proof) {
Ok(proof.clone())
if members.contains(proof) {
Ok(*proof)
} else {
Err(())
}
}

fn alias_in_context(secret: &Self::Secret, _context: &[u8]) -> Result<Alias, ()> {
Ok(secret.clone())
Ok(*secret)
}

fn sign(secret: &Self::Secret, _message: &[u8]) -> Result<Self::Signature, ()> {
Ok(secret.clone())
Ok(*secret)
}

fn verify_signature(
Expand Down Expand Up @@ -179,7 +179,7 @@ impl GenerateVerifiable for Simple {
if !set.contains(member) {
return Err(());
}
Ok((member.clone(), set))
Ok((*member, set))
}

#[cfg(feature = "prover")]
Expand All @@ -189,7 +189,7 @@ impl GenerateVerifiable for Simple {
context: &[u8],
message: &[u8],
) -> Result<(Self::Proof, Alias), ()> {
let public = Self::member_from_secret(&secret);
let public = Self::member_from_secret(secret);
if member != public {
return Err(());
}
Expand All @@ -199,7 +199,7 @@ impl GenerateVerifiable for Simple {

let sig = (context, message)
.using_encoded(|b| pair.sign(signing_context(SIG_CON).bytes(b)).to_bytes());
Ok(((sig, public.clone()), public))
Ok(((sig, public), public))
}

fn validate(
Expand All @@ -216,13 +216,13 @@ impl GenerateVerifiable for Simple {
let p = PublicKey::from_bytes(&proof.1).unwrap();
(context, message).using_encoded(|b| {
p.verify_simple(SIG_CON, b, &s)
.map(|_| proof.1.clone())
.map(|_| proof.1)
.map_err(|_| ())
})
}

fn alias_in_context(secret: &Self::Secret, _context: &[u8]) -> Result<Alias, ()> {
Ok(Self::member_from_secret(&secret))
Ok(Self::member_from_secret(secret))
}

fn sign(secret: &Self::Secret, message: &[u8]) -> Result<Self::Signature, ()> {
Expand Down Expand Up @@ -259,13 +259,11 @@ mod tests {
let bob = <Simple as GenerateVerifiable>::member_from_secret(&bob_sec);

let mut inter = <Simple as GenerateVerifiable>::start_members(());
<Simple as GenerateVerifiable>::push_members(
&mut inter,
[alice.clone()].into_iter(),
|_| Ok(alloc::vec![()]),
)
<Simple as GenerateVerifiable>::push_members(&mut inter, [alice].into_iter(), |_| {
Ok(alloc::vec![()])
})
.unwrap();
<Simple as GenerateVerifiable>::push_members(&mut inter, [bob.clone()].into_iter(), |_| {
<Simple as GenerateVerifiable>::push_members(&mut inter, [bob].into_iter(), |_| {
Ok(alloc::vec![()])
})
.unwrap();
Expand Down
3 changes: 2 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#![cfg_attr(not(feature = "std"), no_std)]
#![allow(clippy::result_unit_err)]

extern crate alloc;
extern crate core;
Expand Down Expand Up @@ -159,7 +160,7 @@ pub trait GenerateVerifiable {
/// individual.
///
/// - `context`: The context under which membership is proven. Proofs over different `[u8]`s
/// are unlinkable.
/// are unlinkable.
///
/// NOTE: We never expect to use this code on-chain; it should be used only in the wallet.
///
Expand Down
Loading