Fixes after merge to latest verion-3

pooltogether · Jun 24, 2020 · 3a628ed · 3a628ed
1 parent 232272c
commit 3a628ed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/contracts/counterfactual-action/CounterfactualAction.sol b/contracts/counterfactual-action/CounterfactualAction.sol
@@ -4,11 +4,11 @@ import "../periodic-prize-pool/PeriodicPrizePoolInterface.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/IERC20.sol";
 
 contract CounterfactualAction {
-  function mintTickets(address payable user, PeriodicPrizePoolInterface prizePool, bytes calldata data) external {
+  function mintTickets(address payable user, PeriodicPrizePoolInterface prizePool, bytes calldata data, bytes calldata operatorData) external {
     IERC20 token = prizePool.token();
     uint256 amount = token.balanceOf(address(this));
     token.approve(address(prizePool), amount);
-    prizePool.mintTickets(user, amount, data);
+    prizePool.mintTickets(user, amount, data, operatorData);
     selfdestruct(user);
   }
 

diff --git a/contracts/counterfactual-action/CounterfactualActionFactory.sol b/contracts/counterfactual-action/CounterfactualActionFactory.sol
@@ -19,9 +19,9 @@ contract CounterfactualActionFactory {
     return Create2.computeAddress(salt(user), keccak256(MinimalProxyLibrary.minimalProxy(address(depositor))));
   }
 
-  function mintTickets(address payable user, bytes calldata data) external {
+  function mintTickets(address payable user, bytes calldata data, bytes calldata operatorData) external {
     CounterfactualAction d = newAction(user);
-    d.mintTickets(user, prizePool, data);
+    d.mintTickets(user, prizePool, data, operatorData);
   }
 
   function cancel(address payable user) external {

diff --git a/test/CounterfactualActionFactory.test.js b/test/CounterfactualActionFactory.test.js
@@ -9,7 +9,7 @@ const { deployContract, deployMockContract } = require('ethereum-waffle')
 const toWei = ethers.utils.parseEther
 
 describe('CounterfactualActionFactory', () => {
-  
+
   let wallet, wallet2
 
   let token, prizePool
@@ -35,9 +35,9 @@ describe('CounterfactualActionFactory', () => {
 
       await token.mock.balanceOf.withArgs(address).returns(depositAmount)
       await token.mock.approve.withArgs(prizePool.address, depositAmount).returns(true)
-      await prizePool.mock.mintTickets.withArgs(wallet._address, depositAmount, []).returns()
+      await prizePool.mock.mintTickets.withArgs(wallet._address, depositAmount, [], []).returns()
 
-      await factory.mintTickets(wallet._address, [])
+      await factory.mintTickets(wallet._address, [], [])
     })
   })