Merge 32c9632 into 8f6c2d1

pooltogether · Oct 7, 2021 · f8e62e9 · f8e62e9
2 parents 8f6c2d1 + 32c9632
commit f8e62e9
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 87 deletions.
diff --git a/contracts/test/ERC20Mintable.sol b/contracts/test/ERC20Mintable.sol
@@ -20,9 +20,8 @@ contract ERC20Mintable is ERC20 {
      *
      * - the caller must have the {MinterRole}.
      */
-    function mint(address account, uint256 amount) public returns (bool) {
+    function mint(address account, uint256 amount) public {
         _mint(account, amount);
-        return true;
     }
 
     function burn(address account, uint256 amount) public returns (bool) {

diff --git a/contracts/test/MockYieldSource.sol b/contracts/test/MockYieldSource.sol
diff --git a/deploy/deploy.js b/deploy/deploy.js
@@ -100,7 +100,7 @@ module.exports = async (hardhat) => {
   cyan('\nDeploying MockYieldSource...');
   const mockYieldSourceResult = await deploy('MockYieldSource', {
     from: deployer,
-    args: ['YIELD', 'YLD'],
+    args: ['Token', 'TOK'],
   });
 
   displayResult('MockYieldSource', mockYieldSourceResult);

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -72,6 +72,11 @@ const config: HardhatUserConfig = {
             },
         ],
     },
+    dependencyCompiler: {
+        paths: [
+            '@pooltogether/yield-source-interface/contracts/test/MockYieldSource.sol',
+        ],
+    },
 };
 
 export default config;
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "@pooltogether/fixed-point": "1.0.0",
     "@pooltogether/owner-manager-contracts": "1.1.0",
     "@pooltogether/pooltogether-rng-contracts": "1.4.0",
-    "@pooltogether/yield-source-interface": "1.0.2",
+    "@pooltogether/yield-source-interface": "1.2.0",
     "deploy-eip-1820": "1.0.0"
   },
   "devDependencies": {

diff --git a/test/features/support/PoolEnv.js b/test/features/support/PoolEnv.js
@@ -5,7 +5,7 @@ require('../../helpers/chaiMatchers');
 
 const { ethers, deployments } = hardhat;
 
-const { AddressZero, MaxUint256 } = ethers.constants;
+const { AddressZero } = ethers.constants;
 
 const debug = require('debug')('pt:PoolEnv.js');
 
@@ -29,7 +29,9 @@ function PoolEnv() {
   this.token = async function (wallet) {
     const yieldSource = await this.yieldSource();
     const tokenAddress = await yieldSource.depositToken();
-    return (await ethers.getContractAt('ERC20Mintable', tokenAddress)).connect(wallet);
+    return (
+        await ethers.getContractAt('contracts/test/ERC20Mintable.sol:ERC20Mintable', tokenAddress)
+    ).connect(wallet);
   };
 
   this.ticket = async (wallet) => (await ethers.getContract('Ticket')).connect(wallet);

diff --git a/yarn.lock b/yarn.lock
@@ -704,10 +704,10 @@
   resolved "https://registry.yarnpkg.com/@pooltogether/uniform-random-number/-/uniform-random-number-1.0.0-beta.2.tgz#fcc388269098a7303c83de6f07cdc5d46dede0e9"
   integrity sha512-xwEpcg+WXcoWtRdG9WPmE5B93YvkhBi4XCEVQ/kfkXS5tVsrhCjFHWQOuqvX2P7zMyCuI/Bq6Y84QQJnRywJhg==
 
-"@pooltogether/yield-source-interface@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@pooltogether/yield-source-interface/-/yield-source-interface-1.0.2.tgz#59630684e0e55310577e9bf07fd778b60676c8ec"
-  integrity sha512-dt/lkK+0erPHi9FpVaYLA2+PiWJb7sODB/2J/LyrENtAe2Miob03005ijLY3zHb4NtQUEGDDPM0uX51jniex7A==
+"@pooltogether/yield-source-interface@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@pooltogether/yield-source-interface/-/yield-source-interface-1.2.0.tgz#ffed283f43fb5f099760dd287e784678b7cc42ad"
+  integrity sha512-OHakTHeSS3KPpmm6QjBNXc8jvC38SxoCvWe/HKV7zBLZMZ7NqY5Uby0rjzxej9taDc9ssE6p1p7RSWtpF4iz9Q==
 
 "@resolver-engine/core@^0.3.3":
   version "0.3.3"