Skip to content

Commit 5b9a504

Browse files
siriusyimlovel8
authored andcommitted
fix: πŸ› fix submitDatasetChallengeProofs
βœ… Closes: #377
1 parent 7957bb8 commit 5b9a504

5 files changed

Lines changed: 49 additions & 25 deletions

File tree

β€Žsrc/v0.8/module/dataset/DatasetsChallenge.solβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ contract DatasetsChallenge is
161161
bytes32[] memory roots = _getChallengeRoots(
162162
_datasetId,
163163
_randomSeed,
164-
getChallengePointsCountRequirement(_datasetId)
164+
roles.filplus().datasetRuleChallengePointsPerAuditor()
165165
);
166166

167167
datasetChallengeProof._submitDatasetChallengeProofs(

β€Žtest/v0.8/helpers/utils/Generator.solβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ contract Generator {
6262
for (uint64 i = 0; i < _count; i++) {
6363
nonce++;
6464
if (_dataType == DatasetType.DataType.Source) {
65-
sizes[i] = nonce * 100;
65+
sizes[i] = nonce * 100 + 1024 * 1024 * 1024 * 30;
6666
} else {
6767
sizes[i] = nonce;
6868
}

β€Žtest/v0.8/testcases/module/dataset/SubmitProofTestSuite.solβ€Ž

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,14 @@ contract SubmitProofTestCaseWithInvalidProportion is DatasetsTestBase {
367367
0
368368
);
369369

370+
for (uint64 i = 0; i < sourceLeavesSizes.length; i++) {
371+
sourceLeavesSizes[i] =
372+
sourceLeavesSizes[i] +
373+
1024 *
374+
1024 *
375+
1024 *
376+
30;
377+
}
370378
vm.expectRevert(bytes("Invalid mappingFiles percentage"));
371379
datasetsAssertion.submitDatasetProofAssertion(
372380
address(99),

β€Žtest/v0.8/testcases/module/dataset/SubmittChallengeProofsTestSuite.solβ€Ž

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,23 @@ contract SubmittChallengeProofsTestCaseWithSuccess is DatasetsTestBase {
6969
uint64 randomSeed;
7070

7171
datasetsAssertion.isWinnerAssersion(_id, address(199), true);
72+
uint64 auditorsRequirement = datasetsChallenge
73+
.getChallengeAuditorsCountRequirement(_id);
7274

73-
(randomSeed, leaves, siblings, paths) = datasetsHelpers
74-
.generateVerification(pointCount);
75+
for (uint160 i = 0; i < auditorsRequirement; i++) {
76+
address caller = address(199 + i);
77+
(randomSeed, leaves, siblings, paths) = datasetsHelpers
78+
.generateVerification(pointCount);
7579

76-
datasetsAssertion.submitDatasetChallengeProofsAssertion(
77-
address(199),
78-
_id,
79-
randomSeed,
80-
leaves,
81-
siblings,
82-
paths
83-
);
80+
datasetsAssertion.submitDatasetChallengeProofsAssertion(
81+
caller,
82+
_id,
83+
randomSeed,
84+
leaves,
85+
siblings,
86+
paths
87+
);
88+
}
8489
}
8590
}
8691

β€Žtest/v0.8/testcases/module/dataset/setup/DatasetsTestSetup.solβ€Ž

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ contract DatasetsTestSetup is Test {
156156
datasetId,
157157
DatasetType.DataType.Source,
158158
"",
159-
100,
159+
300,
160160
true
161161
);
162162
_datasetsHelpers.submitDatasetProof(
@@ -183,24 +183,35 @@ contract DatasetsTestSetup is Test {
183183
address _caller
184184
) public returns (uint64 id) {
185185
id = verificationTestSetup(_datasetsHelpers);
186-
vm.startPrank(_caller);
187-
188-
vm.deal(_caller, 1000 ether);
189-
_datasetsHelpers.getRoles().finance().deposit{value: 1000 ether}(
190-
id,
191-
0,
192-
_caller,
193-
FinanceType.FIL
194-
);
195-
_datasetsHelpers
186+
uint64 auditorsRequirement = _datasetsHelpers
196187
.getRoles()
197188
.datasetsChallenge()
198-
.nominateAsDatasetAuditorCandidate(id);
199-
vm.stopPrank();
189+
.getChallengeAuditorsCountRequirement(id);
190+
191+
for (uint160 i = 0; i < auditorsRequirement; i++) {
192+
address caller = address(uint160(_caller) + i);
193+
vm.startPrank(caller);
194+
195+
vm.deal(caller, 1000 ether);
196+
_datasetsHelpers.getRoles().finance().deposit{value: 1000 ether}(
197+
id,
198+
0,
199+
caller,
200+
FinanceType.FIL
201+
);
202+
_datasetsHelpers
203+
.getRoles()
204+
.datasetsChallenge()
205+
.nominateAsDatasetAuditorCandidate(id);
206+
207+
vm.stopPrank();
208+
}
209+
200210
uint64 delayBlocks = _datasetsHelpers
201211
.getRoles()
202212
.datasetsChallenge()
203213
.getAuditorElectionEndHeight(id);
214+
204215
vm.roll(delayBlocks);
205216
}
206217

0 commit comments

Comments
Β (0)