passing tests

contracts/PrizeSplitStrategy.sol

@@ -55,7 +55,7 @@ contract PrizeSplitStrategy is PrizeSplit, IStrategy {
     * @param _amount Amount of minted tokens.
   */
   function _awardPrizeSplitAmount(address _to, uint256 _amount) override internal {
-    IControlledToken _ticket = prizePool.ticket();
+    IControlledToken _ticket = prizePool.getTicket();
     prizePool.award(_to, _amount);
     emit PrizeSplitAwarded(_to, _amount, _ticket);
   }

contracts/interfaces/IPrizePool.sol

@@ -141,6 +141,10 @@ interface IPrizePool {
     * @notice Read ticket variable
   */
   function getTicket() external view returns (IControlledToken);
+  /**
+    * @notice Read token variable
+  */
+  function getToken() external view returns (address);
   /**
     * @notice Read prizeStrategy variable
   */
@@ -193,14 +197,6 @@ interface IPrizePool {
   /// @return True if ticket has been successfully set.
   function setTicket(IControlledToken _ticket) external returns (bool);
 
-  /// @dev Returns the address of the prize pool ticket.
-  /// @return The address of the prize pool ticket.
-  function ticket() external view returns (IControlledToken);
-
-  /// @dev Returns the address of the underlying ERC20 asset
-  /// @return The address of the asset
-  function token() external view returns (address);
-
   /// @notice Delegate the votes for a Compound COMP-like token held by the prize pool
   /// @param _compLike The COMP-like token held by the prize pool that should be delegated
   /// @param _to The address to delegate to

contracts/interfaces/IReserve.sol

@@ -6,8 +6,8 @@ interface IReserve {
 
   /**
     * @notice Emit when checkpoint is created.
-    * @param destination Address receiving funds 
-    * @param amount      Amount of tokens transfered.
+    * @param reserveAccumulated  Total depsosited
+    * @param withdrawAccumulated Total withdrawn
    */
 
   event Checkpoint(uint256 reserveAccumulated, uint256 withdrawAccumulated);

contracts/prize-pool/PrizePool.sol

@@ -29,7 +29,7 @@ abstract contract PrizePool is IPrizePool, Ownable, ReentrancyGuard, IERC721Rece
   string constant public VERSION = "4.0.0";
 
   /// @notice Prize Pool ticket. Can only be set once by calling `setTicket()`.
-  IControlledToken internal override ticket;
+  IControlledToken internal ticket;
 
   /// @notice The Prize Strategy that this Prize Pool is bound to.
   address internal prizeStrategy;
@@ -111,7 +111,7 @@ abstract contract PrizePool is IPrizePool, Ownable, ReentrancyGuard, IERC721Rece
   }
 
   /// @inheritdoc IPrizePool
-  function token() external override view returns (address) {
+  function getToken() external override view returns (address) {
     return address(_token());
   }
 

test/PrizeSplitStrategy.test.ts

@@ -41,7 +41,7 @@ describe('PrizeSplitStrategy', () => {
     debug('mocking ticket and prizePool...');
     ticket = await erc20MintableFactory.deploy('Ticket', 'TICK');
     prizePool = await deployMockContract(wallet1 as Signer, PrizePool.abi);
-    await prizePool.mock.ticket.returns(ticket.address);
+    await prizePool.mock.getTicket.returns(ticket.address);
 
     debug('deploy prizeSplitStrategy...');
     prizeSplitStrategy = await prizeSplitStrategyFactory.deploy(wallet1.address, prizePool.address);

test/Ticket.test.ts

@@ -57,7 +57,7 @@ describe('Ticket', () => {
 
     prizePool = await deployMockContract(wallet1 as Signer, PrizePool.abi);
     ticket = await deployTicketContract(ticketName, ticketSymbol, ticketDecimals, prizePool.address);
-    prizePool.mock.balanceCap.returns(MaxUint256);
+    prizePool.mock.getBalanceCap.returns(MaxUint256);
   });
 
   describe('constructor()', () => {

test/prize-pool/PrizePool.test.ts

@@ -116,7 +116,7 @@ describe('PrizePool', function () {
     });
 
     it('should set all the vars', async () => {
-      expect(await prizePool.token()).to.equal(depositToken.address);
+      expect(await prizePool.getToken()).to.equal(depositToken.address);
     });
 
     it('should reject invalid params', async () => {
@@ -339,7 +339,7 @@ describe('PrizePool', function () {
           .to.emit(prizePool, 'PrizeStrategySet')
           .withArgs(randomWallet.address);
 
-        expect(await prizePool.prizeStrategy()).to.equal(randomWallet.address);
+        expect(await prizePool.getPrizeStrategy()).to.equal(randomWallet.address);
       });
 
       it('should not allow anyone else to change the prize strategy', async () => {
@@ -357,7 +357,7 @@ describe('PrizePool', function () {
           .to.emit(prizePool, 'BalanceCapSet')
           .withArgs(balanceCap);
 
-        expect(await prizePool.balanceCap()).to.equal(balanceCap);
+        expect(await prizePool.getBalanceCap()).to.equal(balanceCap);
       });
 
       it('should not allow anyone else to call', async () => {
@@ -377,7 +377,7 @@ describe('PrizePool', function () {
           .to.emit(prizePool, 'LiquidityCapSet')
           .withArgs(liquidityCap);
 
-        expect(await prizePool.liquidityCap()).to.equal(liquidityCap);
+        expect(await prizePool.getLiquidityCap()).to.equal(liquidityCap);
       });
 
       it('should not allow anyone else to call', async () => {

test/prize-pool/StakePrizePool.test.ts

@@ -113,7 +113,7 @@ describe('StakePrizePool', function () {
 
   describe('_token()', () => {
     it('should return the staked token', async () => {
-      expect(await prizePool.token()).to.equal(stakeToken.address);
+      expect(await prizePool.getToken()).to.equal(stakeToken.address);
     });
   });
 });

test/prize-pool/YieldSourcePrizePool.test.ts

@@ -35,11 +35,11 @@ describe('YieldSourcePrizePool', function () {
   };
 
   const depositTo = async (amount: BigNumber) => {
-      await yieldSource.mock.supplyTokenTo.withArgs(amount, prizePool.address).returns();
+    await yieldSource.mock.supplyTokenTo.withArgs(amount, prizePool.address).returns();
 
-      await depositToken.approve(prizePool.address, amount);
-      await depositToken.mint(wallet.address, amount);
-      await prizePool.depositTo(wallet.address, amount);
+    await depositToken.approve(prizePool.address, amount);
+    await depositToken.mint(wallet.address, amount);
+    await prizePool.depositTo(wallet.address, amount);
   }
 
   beforeEach(async () => {
@@ -136,7 +136,7 @@ describe('YieldSourcePrizePool', function () {
 
   describe('token()', async () => {
     it('should return the yield source token', async () => {
-      expect(await prizePool.token()).to.equal(depositToken.address);
+      expect(await prizePool.getToken()).to.equal(depositToken.address);
     });
   });