refactor: sigma-rs::codec::trait -> sigma-rs::codec::traits

This is consistent with the core sigma protocol.

Author: mmaker

src/codec/keccak_codec.rs

@@ -20,7 +20,7 @@
 //! - `KeccakPermutationState`: Low-level Keccak-f\[1600\] state representation
 //! - `KeccakDuplexSponge`: Duplex sponge over 200-byte state buffer
 //! - `ByteSchnorrCodec`: Fiat-Shamir codec compatible with Sage Schnorr proofs
-use crate::codec::r#trait::{Codec, DuplexSpongeInterface};
+use crate::codec::traits::{Codec, DuplexSpongeInterface};
 use ff::PrimeField;
 use group::{Group, GroupEncoding};
 use num_bigint::BigUint;

src/codec/mod.rs

@@ -1,7 +1,7 @@
 pub mod keccak_codec;
 pub mod shake_codec;
-pub mod r#trait;
+pub mod traits;
 
 pub use keccak_codec::{ByteSchnorrCodec, KeccakDuplexSponge};
 pub use shake_codec::ShakeCodec;
-pub use r#trait::Codec;
+pub use traits::Codec;

src/codec/shake_codec.rs

@@ -18,7 +18,7 @@ use sha3::{
     digest::{ExtendableOutput, Update, XofReader},
 };
 
-use crate::codec::r#trait::Codec;
+use crate::codec::traits::Codec;
 
 /// A Fiat-Shamir codec over a group `G`, using SHAKE128.
 ///

src/codec/trait.rs renamed to src/codec/traits.rs

@@ -22,6 +22,5 @@ pub mod traits;
 
 pub mod codec;
 
-
 #[cfg(test)]
 pub mod tests;

src/lib.rs

@@ -2,14 +2,14 @@ use curve25519_dalek::ristretto::RistrettoPoint;
 use group::Group;
 use rand::rngs::OsRng;
 
-use crate::codec::ShakeCodec;
-use crate::composition::{Protocol, ProtocolWitness};
-use crate::fiat_shamir::{HasGroupMorphism, NISigmaProtocol};
-use crate::schnorr_protocol::SchnorrProtocol;
 use super::test_utils::{
     bbs_blind_commitment_computation, discrete_logarithm, dleq, pedersen_commitment,
     pedersen_commitment_dleq,
 };
+use crate::codec::ShakeCodec;
+use crate::composition::{Protocol, ProtocolWitness};
+use crate::fiat_shamir::{HasGroupMorphism, NISigmaProtocol};
+use crate::schnorr_protocol::SchnorrProtocol;
 
 type G = RistrettoPoint;
 
@@ -65,8 +65,7 @@ fn composition_proof_correct() {
         Protocol::Simple(SchnorrProtocol::from(morph1)),
         Protocol::Simple(SchnorrProtocol::from(morph2)),
     ]);
-    let or_witness1 =
-        ProtocolWitness::Or(0, vec![ProtocolWitness::Simple(witness1)]);
+    let or_witness1 = ProtocolWitness::Or(0, vec![ProtocolWitness::Simple(witness1)]);
 
     let simple_protocol1 = Protocol::from(morph3);
     let simple_witness1 = ProtocolWitness::Simple(witness3);

src/tests/composition_protocol.rs

@@ -1,4 +1,4 @@
 mod composition_protocol;
-pub mod test_utils;
 mod morphism_preimage;
-mod spec;
+mod spec;
+pub mod test_utils;

src/tests/mod.rs

@@ -2,12 +2,12 @@ use ff::PrimeField;
 use group::{Group, GroupEncoding};
 use rand::{CryptoRng, Rng};
 
-use crate::tests::spec::random::SRandom;
 use crate::codec::Codec;
 use crate::errors::Error;
 use crate::fiat_shamir::FiatShamir;
 use crate::group_morphism::GroupMorphismPreimage;
 use crate::group_serialization::*;
+use crate::tests::spec::random::SRandom;
 use crate::traits::SigmaProtocol;
 
 pub struct SchnorrProtocolCustom<G: SRandom + GroupEncoding>(pub GroupMorphismPreimage<G>);

src/tests/spec/custom_schnorr_protocol.rs

@@ -11,7 +11,9 @@ use crate::tests::test_utils::{
     pedersen_commitment_dleq,
 };
 
-use crate::tests::spec::{custom_schnorr_protocol::SchnorrProtocolCustom, random::SRandom, test_drng::TestDRNG};
+use crate::tests::spec::{
+    custom_schnorr_protocol::SchnorrProtocolCustom, random::SRandom, test_drng::TestDRNG,
+};
 
 type Codec = ByteSchnorrCodec<G, KeccakDuplexSponge>;
 type SigmaP = SchnorrProtocolCustom<G>;