@@ -3,9 +3,10 @@ pragma solidity 0.8.24;
33
44import {Test} from "forge-std/Test.sol " ;
55import {console} from "forge-std/console.sol " ; // Import the console for logging
6- import {KlerosCoreMock, KlerosCoreBase, IArbitratorV2} from "../../src/test/KlerosCoreMock.sol " ;
6+ import {KlerosCoreMock, KlerosCoreBase} from "../../src/test/KlerosCoreMock.sol " ;
7+ import {IArbitratorV2} from "../../src/arbitration/KlerosCoreBase.sol " ;
78import {IDisputeKit} from "../../src/arbitration/interfaces/IDisputeKit.sol " ;
8- import {DisputeKitClassic} from "../../src/arbitration/dispute-kits/DisputeKitClassic.sol " ;
9+ import {DisputeKitClassic, DisputeKitClassicBase } from "../../src/arbitration/dispute-kits/DisputeKitClassic.sol " ;
910import {DisputeKitSybilResistant} from "../../src/arbitration/dispute-kits/DisputeKitSybilResistant.sol " ;
1011import {ISortitionModule} from "../../src/arbitration/interfaces/ISortitionModule.sol " ;
1112import {SortitionModuleMock, SortitionModuleBase} from "../../src/test/SortitionModuleMock.sol " ;
@@ -1326,7 +1327,7 @@ contract KlerosCoreTest is Test {
13261327 uint256 nbChoices = 2 ;
13271328 vm.prank (disputer);
13281329 vm.expectEmit (true , true , true , true );
1329- emit DisputeKitClassic .DisputeCreation (disputeID, nbChoices, newExtraData);
1330+ emit DisputeKitClassicBase .DisputeCreation (disputeID, nbChoices, newExtraData);
13301331 vm.expectEmit (true , true , true , true );
13311332 emit IArbitratorV2.DisputeCreation (disputeID, arbitrable);
13321333 arbitrable.createDispute {value: 0.04 ether }("Action " );
@@ -1592,7 +1593,7 @@ contract KlerosCoreTest is Test {
15921593
15931594 vm.prank (staker1);
15941595 vm.expectEmit (true , true , true , true );
1595- emit DisputeKitClassic .CommitCast (disputeID, staker1, voteIDs, commit);
1596+ emit DisputeKitClassicBase .CommitCast (disputeID, staker1, voteIDs, commit);
15961597 disputeKit.castCommit (disputeID, voteIDs, commit);
15971598
15981599 (, , , uint256 totalCommited , uint256 nbVoters , uint256 choiceCount ) = disputeKit.getRoundInfo (disputeID, 0 , 0 );
@@ -1608,7 +1609,7 @@ contract KlerosCoreTest is Test {
16081609
16091610 vm.prank (staker1);
16101611 vm.expectEmit (true , true , true , true );
1611- emit DisputeKitClassic .CommitCast (disputeID, staker1, voteIDs, commit);
1612+ emit DisputeKitClassicBase .CommitCast (disputeID, staker1, voteIDs, commit);
16121613 disputeKit.castCommit (disputeID, voteIDs, commit);
16131614
16141615 (, , , totalCommited, nbVoters, choiceCount) = disputeKit.getRoundInfo (disputeID, 0 , 0 );
@@ -1913,7 +1914,7 @@ contract KlerosCoreTest is Test {
19131914
19141915 vm.prank (crowdfunder1);
19151916 vm.expectEmit (true , true , true , true );
1916- emit DisputeKitClassic .Contribution (disputeID, 0 , 1 , crowdfunder1, 0.21 ether);
1917+ emit DisputeKitClassicBase .Contribution (disputeID, 0 , 1 , crowdfunder1, 0.21 ether);
19171918 disputeKit.fundAppeal {value: 0.21 ether }(disputeID, 1 ); // Fund the losing choice. Total cost will be 0.63 (0.21 + 0.21 * (20000/10000))
19181919
19191920 assertEq (crowdfunder1.balance, 9.79 ether, "Wrong balance of the crowdfunder " );
@@ -1922,9 +1923,9 @@ contract KlerosCoreTest is Test {
19221923
19231924 vm.prank (crowdfunder1);
19241925 vm.expectEmit (true , true , true , true );
1925- emit DisputeKitClassic .Contribution (disputeID, 0 , 1 , crowdfunder1, 0.42 ether);
1926+ emit DisputeKitClassicBase .Contribution (disputeID, 0 , 1 , crowdfunder1, 0.42 ether);
19261927 vm.expectEmit (true , true , true , true );
1927- emit DisputeKitClassic .ChoiceFunded (disputeID, 0 , 1 );
1928+ emit DisputeKitClassicBase .ChoiceFunded (disputeID, 0 , 1 );
19281929 disputeKit.fundAppeal {value: 5 ether }(disputeID, 1 ); // Deliberately overpay to check reimburse
19291930
19301931 assertEq (crowdfunder1.balance, 9.37 ether, "Wrong balance of the crowdfunder " );
@@ -2117,7 +2118,7 @@ contract KlerosCoreTest is Test {
21172118 vm.expectEmit (true , true , true , true );
21182119 emit KlerosCoreBase.DisputeKitJump (disputeID, 1 , newDkID, DISPUTE_KIT_CLASSIC);
21192120 vm.expectEmit (true , true , true , true );
2120- emit DisputeKitClassic .DisputeCreation (disputeID, 2 , newExtraData);
2121+ emit DisputeKitClassicBase .DisputeCreation (disputeID, 2 , newExtraData);
21212122 vm.expectEmit (true , true , true , true );
21222123 emit KlerosCoreBase.AppealDecision (disputeID, arbitrable);
21232124 vm.expectEmit (true , true , true , true );
@@ -2692,11 +2693,11 @@ contract KlerosCoreTest is Test {
26922693 assertEq (address (disputeKit).balance, 1.04 ether, "Wrong balance of the DK " );
26932694
26942695 vm.expectEmit (true , true , true , true );
2695- emit DisputeKitClassic .Withdrawal (disputeID, 0 , 1 , crowdfunder1, 0.63 ether);
2696+ emit DisputeKitClassicBase .Withdrawal (disputeID, 0 , 1 , crowdfunder1, 0.63 ether);
26962697 disputeKit.withdrawFeesAndRewards (disputeID, payable (crowdfunder1), 0 , 1 );
26972698
26982699 vm.expectEmit (true , true , true , true );
2699- emit DisputeKitClassic .Withdrawal (disputeID, 0 , 2 , crowdfunder2, 0.41 ether);
2700+ emit DisputeKitClassicBase .Withdrawal (disputeID, 0 , 2 , crowdfunder2, 0.41 ether);
27002701 disputeKit.withdrawFeesAndRewards (disputeID, payable (crowdfunder2), 0 , 2 );
27012702
27022703 assertEq (crowdfunder1.balance, 10 ether, "Wrong balance of the crowdfunder1 " );
0 commit comments