Skip to content

Commit b3c2f51

Browse files
ledwards2225ledwards2225
authored
chore: remove unnecessary initializations in acir tests (#16545)
There is no need to explicitly initialize empty vectors using `{}` and it makes the tests much harder to read.
1 parent cc38aca commit b3c2f51

11 files changed

+4
-609
lines changed

‎barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ struct AcirFormat {
121121

122122
// Number of gates added to the circuit per original opcode.
123123
// Has length equal to num_acir_opcodes.
124-
std::vector<size_t> gates_per_opcode = {};
124+
std::vector<size_t> gates_per_opcode;
125125

126126
// Set of constrained witnesses
127-
std::set<uint32_t> constrained_witness = {};
127+
std::set<uint32_t> constrained_witness;
128128
// map witness with their minimal bit-range
129-
std::map<uint32_t, uint32_t> minimal_range = {};
129+
std::map<uint32_t, uint32_t> minimal_range;
130130
// map witness with their minimal bit-range implied by array operations
131-
std::map<uint32_t, uint32_t> index_range = {};
131+
std::map<uint32_t, uint32_t> index_range;
132132

133133
// Indices of the original opcode that originated each constraint in AcirFormat.
134134
AcirFormatOriginalOpcodeIndices original_opcode_indices;

‎barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp‎

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,7 @@ TEST_F(AcirFormatTests, TestASingleConstraintNoPubInputs)
3636
.varnum = 4,
3737
.num_acir_opcodes = 1,
3838
.public_inputs = {},
39-
.logic_constraints = {},
40-
.range_constraints = {},
41-
.aes128_constraints = {},
42-
.sha256_compression = {},
43-
.ecdsa_k1_constraints = {},
44-
.ecdsa_r1_constraints = {},
45-
.blake2s_constraints = {},
46-
.blake3_constraints = {},
47-
.keccak_permutations = {},
48-
.poseidon2_constraints = {},
49-
.multi_scalar_mul_constraints = {},
50-
.ec_add_constraints = {},
51-
.honk_recursion_constraints = {},
52-
.avm_recursion_constraints = {},
53-
.pg_recursion_constraints = {},
54-
.civc_recursion_constraints = {},
55-
.bigint_from_le_bytes_constraints = {},
56-
.bigint_to_le_bytes_constraints = {},
57-
.bigint_operations = {},
58-
.assert_equalities = {},
5939
.poly_triple_constraints = { constraint },
60-
.quad_constraints = {},
61-
.big_quad_constraints = {},
62-
.block_constraints = {},
6340
.original_opcode_indices = create_empty_original_opcode_indices(),
6441
};
6542
mock_opcode_indices(constraint_system);
@@ -152,28 +129,7 @@ TEST_F(AcirFormatTests, TestLogicGateFromNoirCircuit)
152129
.public_inputs = { 1 },
153130
.logic_constraints = { logic_constraint },
154131
.range_constraints = { range_a, range_b },
155-
.aes128_constraints = {},
156-
.sha256_compression = {},
157-
.ecdsa_k1_constraints = {},
158-
.ecdsa_r1_constraints = {},
159-
.blake2s_constraints = {},
160-
.blake3_constraints = {},
161-
.keccak_permutations = {},
162-
.poseidon2_constraints = {},
163-
.multi_scalar_mul_constraints = {},
164-
.ec_add_constraints = {},
165-
.honk_recursion_constraints = {},
166-
.avm_recursion_constraints = {},
167-
.pg_recursion_constraints = {},
168-
.civc_recursion_constraints = {},
169-
.bigint_from_le_bytes_constraints = {},
170-
.bigint_to_le_bytes_constraints = {},
171-
.bigint_operations = {},
172-
.assert_equalities = {},
173132
.poly_triple_constraints = { expr_a, expr_b, expr_c, expr_d },
174-
.quad_constraints = {},
175-
.big_quad_constraints = {},
176-
.block_constraints = {},
177133
.original_opcode_indices = create_empty_original_opcode_indices(),
178134
};
179135
mock_opcode_indices(constraint_system);
@@ -227,30 +183,7 @@ TEST_F(AcirFormatTests, TestKeccakPermutation)
227183
.varnum = 51,
228184
.num_acir_opcodes = 1,
229185
.public_inputs = {},
230-
.logic_constraints = {},
231-
.range_constraints = {},
232-
.aes128_constraints = {},
233-
.sha256_compression = {},
234-
.ecdsa_k1_constraints = {},
235-
.ecdsa_r1_constraints = {},
236-
.blake2s_constraints = {},
237-
.blake3_constraints = {},
238186
.keccak_permutations = { keccak_permutation },
239-
.poseidon2_constraints = {},
240-
.multi_scalar_mul_constraints = {},
241-
.ec_add_constraints = {},
242-
.honk_recursion_constraints = {},
243-
.avm_recursion_constraints = {},
244-
.pg_recursion_constraints = {},
245-
.civc_recursion_constraints = {},
246-
.bigint_from_le_bytes_constraints = {},
247-
.bigint_to_le_bytes_constraints = {},
248-
.bigint_operations = {},
249-
.assert_equalities = {},
250-
.poly_triple_constraints = {},
251-
.quad_constraints = {},
252-
.big_quad_constraints = {},
253-
.block_constraints = {},
254187
.original_opcode_indices = create_empty_original_opcode_indices(),
255188
};
256189
mock_opcode_indices(constraint_system);
@@ -296,30 +229,7 @@ TEST_F(AcirFormatTests, TestCollectsGateCounts)
296229
.varnum = 4,
297230
.num_acir_opcodes = 2,
298231
.public_inputs = {},
299-
.logic_constraints = {},
300-
.range_constraints = {},
301-
.aes128_constraints = {},
302-
.sha256_compression = {},
303-
.ecdsa_k1_constraints = {},
304-
.ecdsa_r1_constraints = {},
305-
.blake2s_constraints = {},
306-
.blake3_constraints = {},
307-
.keccak_permutations = {},
308-
.poseidon2_constraints = {},
309-
.multi_scalar_mul_constraints = {},
310-
.ec_add_constraints = {},
311-
.honk_recursion_constraints = {},
312-
.avm_recursion_constraints = {},
313-
.pg_recursion_constraints = {},
314-
.civc_recursion_constraints = {},
315-
.bigint_from_le_bytes_constraints = {},
316-
.bigint_to_le_bytes_constraints = {},
317-
.bigint_operations = {},
318-
.assert_equalities = {},
319232
.poly_triple_constraints = { first_gate, second_gate },
320-
.quad_constraints = {},
321-
.big_quad_constraints = {},
322-
.block_constraints = {},
323233
.original_opcode_indices = create_empty_original_opcode_indices(),
324234
};
325235
mock_opcode_indices(constraint_system);
@@ -421,29 +331,8 @@ TEST_F(AcirFormatTests, TestBigAdd)
421331
.varnum = static_cast<uint32_t>(num_variables + 1),
422332
.num_acir_opcodes = 1,
423333
.public_inputs = {},
424-
.logic_constraints = {},
425-
.range_constraints = {},
426-
.aes128_constraints = {},
427-
.sha256_compression = {},
428-
.ecdsa_k1_constraints = {},
429-
.ecdsa_r1_constraints = {},
430-
.blake2s_constraints = {},
431-
.blake3_constraints = {},
432-
.keccak_permutations = {},
433-
.poseidon2_constraints = {},
434-
.multi_scalar_mul_constraints = {},
435-
.ec_add_constraints = {},
436-
.honk_recursion_constraints = {},
437-
.avm_recursion_constraints = {},
438-
.civc_recursion_constraints = {},
439-
.bigint_from_le_bytes_constraints = {},
440-
.bigint_to_le_bytes_constraints = {},
441-
.bigint_operations = {},
442-
.assert_equalities = {},
443334
.poly_triple_constraints = { assert_equal },
444-
.quad_constraints = {},
445335
.big_quad_constraints = { quad_constraint },
446-
.block_constraints = {},
447336
.original_opcode_indices = create_empty_original_opcode_indices(),
448337
};
449338
mock_opcode_indices(constraint_system);

‎barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp‎

Lines changed: 0 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -170,30 +170,6 @@ TEST_F(BigIntTests, TestBigIntConstraintMultiple)
170170
.varnum = static_cast<uint32_t>(witness.size() + 1),
171171
.num_acir_opcodes = 5,
172172
.public_inputs = {},
173-
.logic_constraints = {},
174-
.range_constraints = {},
175-
.aes128_constraints = {},
176-
.sha256_compression = {},
177-
.ecdsa_k1_constraints = {},
178-
.ecdsa_r1_constraints = {},
179-
.blake2s_constraints = {},
180-
.blake3_constraints = {},
181-
.keccak_permutations = {},
182-
.poseidon2_constraints = {},
183-
.multi_scalar_mul_constraints = {},
184-
.ec_add_constraints = {},
185-
.honk_recursion_constraints = {},
186-
.avm_recursion_constraints = {},
187-
.pg_recursion_constraints = {},
188-
.civc_recursion_constraints = {},
189-
.bigint_from_le_bytes_constraints = {},
190-
.bigint_to_le_bytes_constraints = {},
191-
.bigint_operations = {},
192-
.assert_equalities = {},
193-
.poly_triple_constraints = {},
194-
.quad_constraints = {},
195-
.big_quad_constraints = {},
196-
.block_constraints = {},
197173
.original_opcode_indices = create_empty_original_opcode_indices(),
198174
};
199175
apply_constraints(constraint_system, contraints);
@@ -237,30 +213,9 @@ TEST_F(BigIntTests, TestBigIntConstraintSimple)
237213
.varnum = 5,
238214
.num_acir_opcodes = 3,
239215
.public_inputs = {},
240-
.logic_constraints = {},
241-
.range_constraints = {},
242-
.aes128_constraints = {},
243-
.sha256_compression = {},
244-
.ecdsa_k1_constraints = {},
245-
.ecdsa_r1_constraints = {},
246-
.blake2s_constraints = {},
247-
.blake3_constraints = {},
248-
.keccak_permutations = {},
249-
.poseidon2_constraints = {},
250-
.multi_scalar_mul_constraints = {},
251-
.ec_add_constraints = {},
252-
.honk_recursion_constraints = {},
253-
.avm_recursion_constraints = {},
254-
.pg_recursion_constraints = {},
255-
.civc_recursion_constraints = {},
256216
.bigint_from_le_bytes_constraints = { from_le_bytes_constraint_bigint1 },
257217
.bigint_to_le_bytes_constraints = { result2_to_le_bytes },
258218
.bigint_operations = { add_constraint },
259-
.assert_equalities = {},
260-
.poly_triple_constraints = {},
261-
.quad_constraints = {},
262-
.big_quad_constraints = {},
263-
.block_constraints = {},
264219
.original_opcode_indices = create_empty_original_opcode_indices(),
265220
};
266221
mock_opcode_indices(constraint_system);
@@ -289,30 +244,6 @@ TEST_F(BigIntTests, TestBigIntConstraintReuse)
289244
.varnum = static_cast<uint32_t>(witness.size() + 1),
290245
.num_acir_opcodes = 5,
291246
.public_inputs = {},
292-
.logic_constraints = {},
293-
.range_constraints = {},
294-
.aes128_constraints = {},
295-
.sha256_compression = {},
296-
.ecdsa_k1_constraints = {},
297-
.ecdsa_r1_constraints = {},
298-
.blake2s_constraints = {},
299-
.blake3_constraints = {},
300-
.keccak_permutations = {},
301-
.poseidon2_constraints = {},
302-
.multi_scalar_mul_constraints = {},
303-
.ec_add_constraints = {},
304-
.honk_recursion_constraints = {},
305-
.avm_recursion_constraints = {},
306-
.pg_recursion_constraints = {},
307-
.civc_recursion_constraints = {},
308-
.bigint_from_le_bytes_constraints = {},
309-
.bigint_to_le_bytes_constraints = {},
310-
.bigint_operations = {},
311-
.assert_equalities = {},
312-
.poly_triple_constraints = {},
313-
.quad_constraints = {},
314-
.big_quad_constraints = {},
315-
.block_constraints = {},
316247
.original_opcode_indices = create_empty_original_opcode_indices(),
317248
};
318249
apply_constraints(constraint_system, contraints);
@@ -345,30 +276,6 @@ TEST_F(BigIntTests, TestBigIntConstraintReuse2)
345276
.varnum = static_cast<uint32_t>(witness.size() + 1),
346277
.num_acir_opcodes = 5,
347278
.public_inputs = {},
348-
.logic_constraints = {},
349-
.range_constraints = {},
350-
.aes128_constraints = {},
351-
.sha256_compression = {},
352-
.ecdsa_k1_constraints = {},
353-
.ecdsa_r1_constraints = {},
354-
.blake2s_constraints = {},
355-
.blake3_constraints = {},
356-
.keccak_permutations = {},
357-
.poseidon2_constraints = {},
358-
.multi_scalar_mul_constraints = {},
359-
.ec_add_constraints = {},
360-
.honk_recursion_constraints = {},
361-
.avm_recursion_constraints = {},
362-
.pg_recursion_constraints = {},
363-
.civc_recursion_constraints = {},
364-
.bigint_from_le_bytes_constraints = {},
365-
.bigint_to_le_bytes_constraints = {},
366-
.bigint_operations = {},
367-
.assert_equalities = {},
368-
.poly_triple_constraints = {},
369-
.quad_constraints = {},
370-
.big_quad_constraints = {},
371-
.block_constraints = {},
372279
.original_opcode_indices = create_empty_original_opcode_indices(),
373280
};
374281
apply_constraints(constraint_system, contraints);
@@ -422,30 +329,9 @@ TEST_F(BigIntTests, TestBigIntDIV)
422329
.varnum = 5,
423330
.num_acir_opcodes = 4,
424331
.public_inputs = {},
425-
.logic_constraints = {},
426-
.range_constraints = {},
427-
.aes128_constraints = {},
428-
.sha256_compression = {},
429-
.ecdsa_k1_constraints = {},
430-
.ecdsa_r1_constraints = {},
431-
.blake2s_constraints = {},
432-
.blake3_constraints = {},
433-
.keccak_permutations = {},
434-
.poseidon2_constraints = {},
435-
.multi_scalar_mul_constraints = {},
436-
.ec_add_constraints = {},
437-
.honk_recursion_constraints = {},
438-
.avm_recursion_constraints = {},
439-
.pg_recursion_constraints = {},
440-
.civc_recursion_constraints = {},
441332
.bigint_from_le_bytes_constraints = { from_le_bytes_constraint_bigint1, from_le_bytes_constraint_bigint2 },
442333
.bigint_to_le_bytes_constraints = { result3_to_le_bytes },
443334
.bigint_operations = { div_constraint },
444-
.assert_equalities = {},
445-
.poly_triple_constraints = {},
446-
.quad_constraints = {},
447-
.big_quad_constraints = {},
448-
.block_constraints = {},
449335
.original_opcode_indices = create_empty_original_opcode_indices(),
450336
};
451337
mock_opcode_indices(constraint_system);

0 commit comments

Comments
 (0)