@@ -45,7 +45,7 @@ contract DeltaProofTest is Test {
4545 valueCommitmentRandomness: valueCommitmentRandomness
4646 });
4747
48- vm.assume (computePreDelta (deltaInstanceInputs) != 0 );
48+ vm.assume (_computePreDelta (deltaInstanceInputs) != 0 );
4949
5050 // Construct delta proof inputs from the above parameters
5151 DeltaGen.ProofInputs memory deltaProofInputs =
@@ -89,14 +89,14 @@ contract DeltaProofTest is Test {
8989 consumed: input1.consumed,
9090 valueCommitmentRandomness: input1.valueCommitmentRandomness
9191 });
92- vm.assume (computePreDelta (deltaInputs1) != 0 );
92+ vm.assume (_computePreDelta (deltaInputs1) != 0 );
9393 DeltaGen.InstanceInputs memory deltaInputs2 = DeltaGen.InstanceInputs ({
9494 kind: kind,
9595 quantity: input2.quantity,
9696 consumed: input2.consumed,
9797 valueCommitmentRandomness: input2.valueCommitmentRandomness
9898 });
99- vm.assume (computePreDelta (deltaInputs2) != 0 );
99+ vm.assume (_computePreDelta (deltaInputs2) != 0 );
100100
101101 // Add the deltas
102102 SignMagnitude.Number memory summedNumber = SignMagnitude.Number (deltaInputs1.consumed, deltaInputs1.quantity)
@@ -112,7 +112,7 @@ contract DeltaProofTest is Test {
112112 // TODO refactor?
113113 summedDeltaInputs.valueCommitmentRandomness = summedDeltaInputs.valueCommitmentRandomness.modOrder ();
114114 vm.assume (summedDeltaInputs.valueCommitmentRandomness != 0 );
115- vm.assume (computePreDelta (summedDeltaInputs) != 0 );
115+ vm.assume (_computePreDelta (summedDeltaInputs) != 0 );
116116
117117 // Generate a delta proof and instance from the above tags and preimage
118118 uint256 [2 ] memory instance1 = DeltaGen.generateInstance (vm, deltaInputs1);
@@ -140,7 +140,7 @@ contract DeltaProofTest is Test {
140140 vm.assume (deltaInstanceInputs.valueCommitmentRandomness != 0 );
141141 vm.assume (DeltaGen.canonicalizeQuantity (deltaInstanceInputs.consumed, deltaInstanceInputs.quantity) != 0 );
142142
143- vm.assume (computePreDelta (deltaInstanceInputs) != 0 );
143+ vm.assume (_computePreDelta (deltaInstanceInputs) != 0 );
144144
145145 // Construct delta proof inputs from the above parameters
146146 DeltaGen.ProofInputs memory deltaProofInputs = DeltaGen.ProofInputs ({
@@ -184,7 +184,7 @@ contract DeltaProofTest is Test {
184184 consumed: consumed,
185185 valueCommitmentRandomness: valueCommitmentRandomness2
186186 });
187- vm.assume (computePreDelta (deltaInputs2) != 0 ); // TODO move?
187+ vm.assume (_computePreDelta (deltaInputs2) != 0 ); // TODO move?
188188
189189 // Generate a delta proof and instance from the above tags and preimage
190190 bytes memory proof1 = DeltaGen.generateProof (vm, deltaInputs1);
@@ -217,7 +217,7 @@ contract DeltaProofTest is Test {
217217 valueCommitmentRandomness: valueCommitmentRandomness
218218 });
219219
220- vm.assume (computePreDelta (deltaInputs2) != 0 );
220+ vm.assume (_computePreDelta (deltaInputs2) != 0 );
221221 DeltaGen.ProofInputs memory deltaInputs1 =
222222 DeltaGen.ProofInputs ({valueCommitmentRandomness: valueCommitmentRandomness, verifyingKey: verifyingKey1});
223223
@@ -266,7 +266,7 @@ contract DeltaProofTest is Test {
266266 for (uint256 i = 0 ; i < wrappedDeltaInputs.length ; i++ ) {
267267 wrappedDeltaInputs[i].valueCommitmentRandomness = wrappedDeltaInputs[i].valueCommitmentRandomness.modOrder ();
268268 vm.assume (wrappedDeltaInputs[i].valueCommitmentRandomness != 0 );
269- vm.assume (computePreDelta (wrappedDeltaInputs[i]) != 0 );
269+ vm.assume (_computePreDelta (wrappedDeltaInputs[i]) != 0 );
270270
271271 uint256 [2 ] memory instance = DeltaGen.generateInstance (vm, wrappedDeltaInputs[i]);
272272 deltaAcc = Delta.add (deltaAcc, instance);
@@ -306,7 +306,7 @@ contract DeltaProofTest is Test {
306306 for (uint256 i = 0 ; i < wrappedDeltaInputs.length ; i++ ) {
307307 wrappedDeltaInputs[i].valueCommitmentRandomness = wrappedDeltaInputs[i].valueCommitmentRandomness.modOrder ();
308308 vm.assume (wrappedDeltaInputs[i].valueCommitmentRandomness != 0 );
309- vm.assume (computePreDelta (wrappedDeltaInputs[i]) != 0 );
309+ vm.assume (_computePreDelta (wrappedDeltaInputs[i]) != 0 );
310310
311311 uint256 [2 ] memory instance = DeltaGen.generateInstance (vm, wrappedDeltaInputs[i]);
312312 deltaAcc = Delta.add (deltaAcc, instance);
@@ -334,7 +334,7 @@ contract DeltaProofTest is Test {
334334 });
335335 }
336336
337- function computePreDelta (DeltaGen.InstanceInputs memory deltaInputs ) internal pure returns (uint256 preDelta ) {
337+ function _computePreDelta (DeltaGen.InstanceInputs memory deltaInputs ) internal pure returns (uint256 preDelta ) {
338338 uint256 canonicalizedQuantity = DeltaGen.canonicalizeQuantity (deltaInputs.consumed, deltaInputs.quantity);
339339 uint256 prod = mulmod (deltaInputs.kind, canonicalizedQuantity, EllipticCurveK256.ORDER);
340340 preDelta = addmod (prod, deltaInputs.valueCommitmentRandomness, EllipticCurveK256.ORDER);
0 commit comments