@@ -18,7 +18,7 @@ type G = RistrettoPoint;
1818fn composition_proof_correct ( ) {
1919 // Composition and verification of proof for the following protocol :
2020 //
21- // protocol = And(
21+ // And(
2222 // Or( dleq, pedersen_commitment ),
2323 // Simple( discrete_logarithm ),
2424 // And( pedersen_commitment_dleq, bbs_blind_commitment_computation )
@@ -27,14 +27,14 @@ fn composition_proof_correct() {
2727 let domain_sep = b"hello world" ;
2828
2929 // definitions of the underlying protocols
30- let ( morph1 , witness1) = dleq ( G :: random ( & mut rng) , <G as Group >:: Scalar :: random ( & mut rng) ) ;
31- let ( morph2 , _) = pedersen_commitment (
30+ let ( map1 , witness1) = dleq ( G :: random ( & mut rng) , <G as Group >:: Scalar :: random ( & mut rng) ) ;
31+ let ( map2 , _) = pedersen_commitment (
3232 G :: random ( & mut rng) ,
3333 <G as Group >:: Scalar :: random ( & mut rng) ,
3434 <G as Group >:: Scalar :: random ( & mut rng) ,
3535 ) ;
36- let ( morph3 , witness3) = discrete_logarithm ( <G as Group >:: Scalar :: random ( & mut rng) ) ;
37- let ( morph4 , witness4) = pedersen_commitment_dleq (
36+ let ( map3 , witness3) = discrete_logarithm ( <G as Group >:: Scalar :: random ( & mut rng) ) ;
37+ let ( map4 , witness4) = pedersen_commitment_dleq (
3838 ( 0 ..4 )
3939 . map ( |_| G :: random ( & mut rng) )
4040 . collect :: < Vec < _ > > ( )
@@ -46,7 +46,7 @@ fn composition_proof_correct() {
4646 . try_into ( )
4747 . unwrap ( ) ,
4848 ) ;
49- let ( morph5 , witness5) = bbs_blind_commitment_computation (
49+ let ( map5 , witness5) = bbs_blind_commitment_computation (
5050 ( 0 ..4 )
5151 . map ( |_| G :: random ( & mut rng) )
5252 . collect :: < Vec < _ > > ( )
@@ -62,17 +62,17 @@ fn composition_proof_correct() {
6262
6363 // second layer protocol definitions
6464 let or_protocol1 = Protocol :: Or ( vec ! [
65- Protocol :: Simple ( SchnorrProof :: from( morph1 ) ) ,
66- Protocol :: Simple ( SchnorrProof :: from( morph2 ) ) ,
65+ Protocol :: Simple ( SchnorrProof :: from( map1 ) ) ,
66+ Protocol :: Simple ( SchnorrProof :: from( map2 ) ) ,
6767 ] ) ;
6868 let or_witness1 = ProtocolWitness :: Or ( 0 , vec ! [ ProtocolWitness :: Simple ( witness1) ] ) ;
6969
70- let simple_protocol1 = Protocol :: from ( morph3 ) ;
70+ let simple_protocol1 = Protocol :: from ( map3 ) ;
7171 let simple_witness1 = ProtocolWitness :: Simple ( witness3) ;
7272
7373 let and_protocol1 = Protocol :: And ( vec ! [
74- Protocol :: Simple ( SchnorrProof :: from( morph4 ) ) ,
75- Protocol :: Simple ( SchnorrProof :: from( morph5 ) ) ,
74+ Protocol :: Simple ( SchnorrProof :: from( map4 ) ) ,
75+ Protocol :: Simple ( SchnorrProof :: from( map5 ) ) ,
7676 ] ) ;
7777 let and_witness1 = ProtocolWitness :: And ( vec ! [
7878 ProtocolWitness :: Simple ( witness4) ,
0 commit comments