Refactored PrizeStrategyBuilder to CompoundPrizePoolBuilder (#69)

pooltogether · Jul 23, 2020 · a27b23b · a27b23b
1 parent 3fddcc1
commit a27b23b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/...s/prize-strategy/PrizeStrategyBuilder.sol → ...cts/builders/CompoundPrizePoolBuilder.sol b/...s/prize-strategy/PrizeStrategyBuilder.sol → ...cts/builders/CompoundPrizePoolBuilder.sol
@@ -4,12 +4,12 @@ pragma experimental ABIEncoderV2;
 import "@openzeppelin/contracts-ethereum-package/contracts/Initializable.sol";
 import "@pooltogether/governor-contracts/contracts/GovernorInterface.sol";
 
-import "./PrizeStrategyProxyFactory.sol";
+import "../prize-strategy/PrizeStrategyProxyFactory.sol";
 import "../prize-pool/compound/CompoundPrizePoolProxyFactory.sol";
 import "../token/ControlledTokenProxyFactory.sol";
 import "../external/compound/CTokenInterface.sol";
 
-contract PrizeStrategyBuilder is Initializable {
+contract CompoundPrizePoolBuilder is Initializable {
   using SafeMath for uint256;
 
   struct Config {
@@ -26,7 +26,7 @@ contract PrizeStrategyBuilder is Initializable {
     address[] externalAwards;
   }
 
-  event PrizeStrategyBuilt (
+  event CompoundPrizePoolCreated (
     address indexed creator,
     address indexed prizePool,
     address indexed prizeStrategy
@@ -47,11 +47,11 @@ contract PrizeStrategyBuilder is Initializable {
     ControlledTokenProxyFactory _controlledTokenProxyFactory,
     RNGInterface _rng
   ) public initializer {
-    require(address(_governor) != address(0), "PrizeStrategyBuilder/governor-not-zero");
-    require(address(_prizeStrategyProxyFactory) != address(0), "PrizeStrategyBuilder/prize-strategy-factory-not-zero");
-    require(address(_compoundPrizePoolProxyFactory) != address(0), "PrizeStrategyBuilder/compound-prize-pool-builder-not-zero");
-    require(address(_controlledTokenProxyFactory) != address(0), "PrizeStrategyBuilder/controlled-token-proxy-factory-not-zero");
-    require(address(_rng) != address(0), "PrizeStrategyBuilder/rng-not-zero");
+    require(address(_governor) != address(0), "CompoundPrizePoolBuilder/governor-not-zero");
+    require(address(_prizeStrategyProxyFactory) != address(0), "CompoundPrizePoolBuilder/prize-strategy-factory-not-zero");
+    require(address(_compoundPrizePoolProxyFactory) != address(0), "CompoundPrizePoolBuilder/compound-prize-pool-builder-not-zero");
+    require(address(_controlledTokenProxyFactory) != address(0), "CompoundPrizePoolBuilder/controlled-token-proxy-factory-not-zero");
+    require(address(_rng) != address(0), "CompoundPrizePoolBuilder/rng-not-zero");
     rng = _rng;
     governor = _governor;
     prizeStrategyProxyFactory = _prizeStrategyProxyFactory;
@@ -91,7 +91,7 @@ contract PrizeStrategyBuilder is Initializable {
 
     prizeStrategy.transferOwnership(msg.sender);
 
-    emit PrizeStrategyBuilt(
+    emit CompoundPrizePoolCreated(
       msg.sender,
       address(prizePool),
       address(prizeStrategy)

diff --git a/js/deployContracts.js b/js/deployContracts.js
@@ -1,7 +1,7 @@
 const RNGServiceMock = require('../build/RNGServiceMock.json')
 const Forwarder = require('../build/Forwarder.json')
 const MockGovernor = require('../build/MockGovernor.json')
-const PrizeStrategyBuilder = require('../build/PrizeStrategyBuilder.json')
+const CompoundPrizePoolBuilder = require('../build/CompoundPrizePoolBuilder.json')
 const CompoundPrizePoolProxyFactory = require('../build/CompoundPrizePoolProxyFactory.json')
 const ControlledTokenProxyFactory = require('../build/ControlledTokenProxyFactory.json')
 const PrizeStrategyProxyFactory = require('../build/PrizeStrategyProxyFactory.json')
@@ -47,8 +47,8 @@ async function deployContracts(wallet, overrides = { gasLimit: 20000000 }) {
 
   debug('deploying prize strategy builder')
 
-  let prizeStrategyBuilder = await deployContract(wallet, PrizeStrategyBuilder, [], overrides)
-  await prizeStrategyBuilder.initialize(
+  let compoundPrizePoolBuilder = await deployContract(wallet, CompoundPrizePoolBuilder, [], overrides)
+  await compoundPrizePoolBuilder.initialize(
     governor.address,
     prizeStrategyProxyFactory.address,
     forwarder.address,
@@ -70,7 +70,7 @@ async function deployContracts(wallet, overrides = { gasLimit: 20000000 }) {
     prizeStrategyProxyFactory,
     controlledTokenProxyFactory,
     compoundPrizePoolProxyFactory,
-    prizeStrategyBuilder
+    compoundPrizePoolBuilder
   }
 }
 

diff --git a/scripts/cli.js b/scripts/cli.js
@@ -91,7 +91,7 @@ program
     } = context.contracts
 
     await migration.migrate(35, async () => {
-      runShell(`oz create PrizeStrategyBuilder --force ${flags} --init initialize --args ${governor},${PrizeStrategyProxyFactory.address},${trustedForwarder},${CompoundPrizePoolProxyFactory.address},${ControlledTokenProxyFactory.address},${rng}`)
+      runShell(`oz create CompoundPrizePoolBuilder --force ${flags} --init initialize --args ${governor},${PrizeStrategyProxyFactory.address},${trustedForwarder},${CompoundPrizePoolProxyFactory.address},${ControlledTokenProxyFactory.address},${rng}`)
     })
 
     context = await buildContext({ network: program.network, address: program.address })

diff --git a/test/PrizeStrategyBuilder.test.js b/test/PrizeStrategyBuilder.test.js
@@ -5,7 +5,7 @@ const { ethers } = require('ethers')
 
 const toWei = ethers.utils.parseEther
 
-describe('PrizeStrategyBuilder', () => {
+describe('CompoundPrizePoolBuilder', () => {
 
   let wallet, env
 
@@ -14,7 +14,7 @@ describe('PrizeStrategyBuilder', () => {
   beforeEach(async () => {
     [wallet] = await buidler.ethers.getSigners()
     env = await deployContracts(wallet)
-    builder = env.prizeStrategyBuilder
+    builder = env.compoundPrizePoolBuilder
   })
 
   describe('initialize()', () => {
@@ -47,7 +47,7 @@ describe('PrizeStrategyBuilder', () => {
       let receipt = await buidler.ethers.provider.getTransactionReceipt(tx.hash)
       let event = builder.interface.parseLog(receipt.logs[receipt.logs.length - 1])
 
-      expect(event.name).to.equal('PrizeStrategyBuilt')
+      expect(event.name).to.equal('CompoundPrizePoolCreated')
 
       let prizeStrategy = await buidler.ethers.getContractAt('PrizeStrategyHarness', event.values.prizeStrategy, wallet)
       let prizePool = await buidler.ethers.getContractAt('CompoundPrizePoolHarness', event.values.prizePool, wallet)