Skip to content

Commit 761d7d3

Browse files
committed
fix tests for iv generation
1 parent 94a5225 commit 761d7d3

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

src/codec.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,10 @@ where
5353
_marker: core::marker::PhantomData<G>,
5454
}
5555

56-
const WORD_SIZE: usize = 32;
56+
const WORD_SIZE: usize = 4;
5757

5858
fn length_to_bytes(x: usize) -> [u8; WORD_SIZE] {
59-
let mut bytes = [0u8; WORD_SIZE];
60-
let x_bytes = x.to_be_bytes();
61-
bytes[WORD_SIZE - x_bytes.len()..].copy_from_slice(&x_bytes);
62-
bytes
59+
(x as u32).to_le_bytes()
6360
}
6461

6562
impl<G, H> Codec for ByteSchnorrCodec<G, H>

src/tests/spec/test_vectors.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,14 @@ fn test_spec_testvectors() {
123123
let iv = *b"yellow submarineyellow submarine";
124124
let vectors = extract_vectors_iv("src/tests/spec/vectors/allVectors.json").unwrap();
125125

126+
// Order functions to match JSON vector order:
127+
// allVectors.json order is: bbs, discrete_log, dleq, pedersen_commitment, pedersen_commitment_dleq
126128
let functions: [fn(&[u8], [u8; 32]) -> (Vec<Scalar>, Vec<u8>); 5] = [
129+
NI_bbs_blind_commitment_computation_iv,
127130
NI_discrete_logarithm_iv,
128131
NI_dleq_iv,
129132
NI_pedersen_commitment_iv,
130133
NI_pedersen_commitment_dleq_iv,
131-
NI_bbs_blind_commitment_computation_iv,
132134
];
133135

134136
for (i, f) in functions.iter().enumerate() {
@@ -150,15 +152,21 @@ fn test_spec_testvectors() {
150152
#[test]
151153
fn test_spec_testvectors_with_fixed_label() {
152154
let seed = b"hello world";
153-
let session_id = b"yellow submarineyellow submarine";
155+
let session_id = b"hello world";
154156
let vectors = extract_vectors_session("src/tests/spec/vectors/fixedLabelVectors.json").unwrap();
155157

158+
// Order functions to match JSON vector order:
159+
// 0: bbs_blind_commitment_computation_with_session_ID
160+
// 1: discrete_logarithm_with_session_ID
161+
// 2: dleq_with_session_ID
162+
// 3: pedersen_commitment_dleq_with_session_ID
163+
// 4: pedersen_commitment_with_session_ID
156164
let functions: [fn(&[u8], &[u8]) -> (Vec<Scalar>, Vec<u8>, Vec<u8>); 5] = [
165+
NI_bbs_blind_commitment_computation_session,
157166
NI_discrete_logarithm_session,
158167
NI_dleq_session,
159-
NI_pedersen_commitment_session,
160168
NI_pedersen_commitment_dleq_session,
161-
NI_bbs_blind_commitment_computation_session,
169+
NI_pedersen_commitment_session,
162170
];
163171

164172
for (i, f) in functions.iter().enumerate() {

0 commit comments

Comments
 (0)