fixup! refactor(prt-contracts): merge (non)rootTournament into Tournament

Author: guidanoli

cartesi-rollups/contracts/test/DaveConsensus.t.sol

@@ -142,7 +142,11 @@ contract MockTournament is ITournament {
         revert NotImplemented();
     }
 
-    function tournamentArguments() external pure override returns (ITournament.TournamentArguments memory) {
+    function tournamentArguments() external pure override returns (TournamentArguments memory) {
+        revert NotImplemented();
+    }
+
+    function nonRootTournamentArgs() external pure override returns (NonRootArguments memory) {
         revert NotImplemented();
     }
 

prt/client-lua/player/reader.lua

@@ -369,7 +369,7 @@ function Reader:inner_tournament_winner(address)
     local winner = {
         has_winner = helper.str_to_bool(ret[1]),
         parent_commitment = Hash:from_digest_hex(ret[2]),
-        dangling_commitment = Hash:from_digest_hex(ret[3]),
+        commitment = Hash:from_digest_hex(ret[3]),
         -- ret[4] contains Clock.State struct (allowance, startInstant) if needed
     }
 

prt/contracts/src/ITournament.sol

@@ -431,6 +431,12 @@ interface ITournament {
         view
         returns (TournamentArguments memory);
 
+    /// @notice Returns non-root tournament arguments
+    function nonRootTournamentArgs()
+        external
+        view
+        returns (NonRootArguments memory);
+
     /// @notice Check whether a match can be won by timeout.
     /// @param matchId The match ID
     function canWinMatchByTimeout(Match.Id calldata matchId)

prt/contracts/src/tournament/abstracts/Tournament.sol

@@ -114,15 +114,15 @@ abstract contract Tournament is ITournament {
     /// NON-ROOT TOURNAMENT (level > 0):
     ///   - Must override this function to return the actual contested final states
     ///   - These are stored in the tournament's argument struct
-    function _nonRootTournamentArgs()
-        internal
+    function nonRootTournamentArgs()
+        public
         view
         virtual
-        returns (ITournament.NonRootArguments memory)
+        returns (NonRootArguments memory)
     {
         // Default implementation for root tournaments (level == 0)
         // Non-root tournaments (level > 0) must override this
-        return ITournament.NonRootArguments({
+        return NonRootArguments({
             contestedCommitmentOne: Tree.ZERO_NODE,
             contestedFinalStateOne: Machine.ZERO_STATE,
             contestedCommitmentTwo: Tree.ZERO_NODE,
@@ -159,7 +159,7 @@ abstract contract Tournament is ITournament {
         // NON-ROOT CASE: level > 0
         // Non-root tournaments only accept commitments that match one of the two
         // contested final states from the parent match
-        NonRootArguments memory nonRootArgs = _nonRootTournamentArgs();
+        NonRootArguments memory nonRootArgs = nonRootTournamentArgs();
         return (
             nonRootArgs.contestedFinalStateOne.eq(_finalState)
                 || nonRootArgs.contestedFinalStateTwo.eq(_finalState),
@@ -170,16 +170,6 @@ abstract contract Tournament is ITournament {
 
     function _totalGasEstimate() internal view virtual returns (uint256);
 
-    //
-    // Helper Functions
-    //
-
-    /// @notice Check if this is a root tournament (level == 0)
-    function _isRootTournament() internal view returns (bool) {
-        TournamentArguments memory args = tournamentArguments();
-        return args.level == 0;
-    }
-
     //
     // Methods
     //
@@ -737,7 +727,7 @@ abstract contract Tournament is ITournament {
 
         // Map the winning final state to one of the two contested final states
         // from the parent match
-        NonRootArguments memory nonRootArgs = _nonRootTournamentArgs();
+        NonRootArguments memory nonRootArgs = nonRootTournamentArgs();
         Machine.Hash _finalState = finalStates[_winner];
 
         if (_finalState.eq(nonRootArgs.contestedFinalStateOne)) {

prt/contracts/src/tournament/concretes/BottomTournament.sol

@@ -9,15 +9,14 @@ import {IStateTransition} from "prt-contracts/IStateTransition.sol";
 import {
     LeafTournament
 } from "prt-contracts/tournament/abstracts/LeafTournament.sol";
-import {Tournament} from "prt-contracts/tournament/abstracts/Tournament.sol";
 
 /// @notice Bottom tournament of a multi-level instance
 contract BottomTournament is LeafTournament {
     using Clones for address;
 
     struct BottomArguments {
         TournamentArguments tournamentArgs;
-        Tournament.NonRootArguments nonRootTournamentArgs;
+        NonRootArguments nonRootTournamentArgs;
         IStateTransition stateTransition;
     }
 
@@ -34,11 +33,11 @@ contract BottomTournament is LeafTournament {
         return _bottomArgs().tournamentArgs;
     }
 
-    function _nonRootTournamentArgs()
-        internal
+    function nonRootTournamentArgs()
+        public
         view
         override
-        returns (Tournament.NonRootArguments memory)
+        returns (NonRootArguments memory)
     {
         return _bottomArgs().nonRootTournamentArgs;
     }

prt/contracts/src/tournament/concretes/MiddleTournament.sol

@@ -8,7 +8,6 @@ import {Clones} from "@openzeppelin-contracts-5.5.0/proxy/Clones.sol";
 import {
     NonLeafTournament
 } from "prt-contracts/tournament/abstracts/NonLeafTournament.sol";
-import {Tournament} from "prt-contracts/tournament/abstracts/Tournament.sol";
 import {
     IMultiLevelTournamentFactory
 } from "prt-contracts/tournament/factories/IMultiLevelTournamentFactory.sol";
@@ -19,7 +18,7 @@ contract MiddleTournament is NonLeafTournament {
 
     struct MiddleArguments {
         TournamentArguments tournamentArgs;
-        Tournament.NonRootArguments nonRootTournamentArgs;
+        NonRootArguments nonRootTournamentArgs;
         IMultiLevelTournamentFactory tournamentFactory;
     }
 
@@ -36,11 +35,11 @@ contract MiddleTournament is NonLeafTournament {
         return _middleArgs().tournamentArgs;
     }
 
-    function _nonRootTournamentArgs()
-        internal
+    function nonRootTournamentArgs()
+        public
         view
         override
-        returns (Tournament.NonRootArguments memory)
+        returns (NonRootArguments memory)
     {
         return _middleArgs().nonRootTournamentArgs;
     }