@@ -3,9 +3,10 @@ pragma solidity 0.8.24;
3
3
4
4
import {Test} from "forge-std/Test.sol " ;
5
5
import {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 " ;
7
8
import {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 " ;
9
10
import {DisputeKitSybilResistant} from "../../src/arbitration/dispute-kits/DisputeKitSybilResistant.sol " ;
10
11
import {ISortitionModule} from "../../src/arbitration/interfaces/ISortitionModule.sol " ;
11
12
import {SortitionModuleMock, SortitionModuleBase} from "../../src/test/SortitionModuleMock.sol " ;
@@ -1326,7 +1327,7 @@ contract KlerosCoreTest is Test {
1326
1327
uint256 nbChoices = 2 ;
1327
1328
vm.prank (disputer);
1328
1329
vm.expectEmit (true , true , true , true );
1329
- emit DisputeKitClassic .DisputeCreation (disputeID, nbChoices, newExtraData);
1330
+ emit DisputeKitClassicBase .DisputeCreation (disputeID, nbChoices, newExtraData);
1330
1331
vm.expectEmit (true , true , true , true );
1331
1332
emit IArbitratorV2.DisputeCreation (disputeID, arbitrable);
1332
1333
arbitrable.createDispute {value: 0.04 ether }("Action " );
@@ -1592,7 +1593,7 @@ contract KlerosCoreTest is Test {
1592
1593
1593
1594
vm.prank (staker1);
1594
1595
vm.expectEmit (true , true , true , true );
1595
- emit DisputeKitClassic .CommitCast (disputeID, staker1, voteIDs, commit);
1596
+ emit DisputeKitClassicBase .CommitCast (disputeID, staker1, voteIDs, commit);
1596
1597
disputeKit.castCommit (disputeID, voteIDs, commit);
1597
1598
1598
1599
(, , , uint256 totalCommited , uint256 nbVoters , uint256 choiceCount ) = disputeKit.getRoundInfo (disputeID, 0 , 0 );
@@ -1608,7 +1609,7 @@ contract KlerosCoreTest is Test {
1608
1609
1609
1610
vm.prank (staker1);
1610
1611
vm.expectEmit (true , true , true , true );
1611
- emit DisputeKitClassic .CommitCast (disputeID, staker1, voteIDs, commit);
1612
+ emit DisputeKitClassicBase .CommitCast (disputeID, staker1, voteIDs, commit);
1612
1613
disputeKit.castCommit (disputeID, voteIDs, commit);
1613
1614
1614
1615
(, , , totalCommited, nbVoters, choiceCount) = disputeKit.getRoundInfo (disputeID, 0 , 0 );
@@ -1913,7 +1914,7 @@ contract KlerosCoreTest is Test {
1913
1914
1914
1915
vm.prank (crowdfunder1);
1915
1916
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);
1917
1918
disputeKit.fundAppeal {value: 0.21 ether }(disputeID, 1 ); // Fund the losing choice. Total cost will be 0.63 (0.21 + 0.21 * (20000/10000))
1918
1919
1919
1920
assertEq (crowdfunder1.balance, 9.79 ether, "Wrong balance of the crowdfunder " );
@@ -1922,9 +1923,9 @@ contract KlerosCoreTest is Test {
1922
1923
1923
1924
vm.prank (crowdfunder1);
1924
1925
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);
1926
1927
vm.expectEmit (true , true , true , true );
1927
- emit DisputeKitClassic .ChoiceFunded (disputeID, 0 , 1 );
1928
+ emit DisputeKitClassicBase .ChoiceFunded (disputeID, 0 , 1 );
1928
1929
disputeKit.fundAppeal {value: 5 ether }(disputeID, 1 ); // Deliberately overpay to check reimburse
1929
1930
1930
1931
assertEq (crowdfunder1.balance, 9.37 ether, "Wrong balance of the crowdfunder " );
@@ -2117,7 +2118,7 @@ contract KlerosCoreTest is Test {
2117
2118
vm.expectEmit (true , true , true , true );
2118
2119
emit KlerosCoreBase.DisputeKitJump (disputeID, 1 , newDkID, DISPUTE_KIT_CLASSIC);
2119
2120
vm.expectEmit (true , true , true , true );
2120
- emit DisputeKitClassic .DisputeCreation (disputeID, 2 , newExtraData);
2121
+ emit DisputeKitClassicBase .DisputeCreation (disputeID, 2 , newExtraData);
2121
2122
vm.expectEmit (true , true , true , true );
2122
2123
emit KlerosCoreBase.AppealDecision (disputeID, arbitrable);
2123
2124
vm.expectEmit (true , true , true , true );
@@ -2692,11 +2693,11 @@ contract KlerosCoreTest is Test {
2692
2693
assertEq (address (disputeKit).balance, 1.04 ether, "Wrong balance of the DK " );
2693
2694
2694
2695
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);
2696
2697
disputeKit.withdrawFeesAndRewards (disputeID, payable (crowdfunder1), 0 , 1 );
2697
2698
2698
2699
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);
2700
2701
disputeKit.withdrawFeesAndRewards (disputeID, payable (crowdfunder2), 0 , 2 );
2701
2702
2702
2703
assertEq (crowdfunder1.balance, 10 ether, "Wrong balance of the crowdfunder1 " );
0 commit comments