fei-protocol · xklob · Sep 21, 2021 · Sep 20, 2021 · Sep 21, 2021 · Sep 21, 2021
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -73,7 +73,7 @@ const config: HardhatUserConfig = {
     },
   },
   paths: {
-    tests: runE2ETests ? './end-to-end' : './test',
+    tests: runE2ETests ? './test/integration/' : './test/unit/',
   },
   mocha: {
     timeout: 1000000,

diff --git a/package.json b/package.json
@@ -18,13 +18,13 @@
     "lint": "eslint --config ./.eslintrc.json --ignore-path ./.eslintignore --ext .js .",
     "lint:fix": "npm run lint --fix",
     "size-contracts": "npx hardhat size-contracts",
-    "deploy:localhost": "npx hardhat run --network localhost deploy/migrations.js",
-    "deploy:main": "npx hardhat run --network mainnet deploy/migrations.js",
-    "deploy:ropsten": "npx hardhat run --network ropsten deploy/migrations.js",
-    "deploy:rinkeby": "npx hardhat run --network rinkeby deploy/migrations.js",
+    "deploy:localhost": "npx hardhat run --network localhost scripts/deploy/migrations.js",
+    "deploy:main": "npx hardhat run --network mainnet scripts/deploy/migrations.js",
+    "deploy:ropsten": "npx hardhat run --network ropsten scripts/deploy/migrations.js",
+    "deploy:rinkeby": "npx hardhat run --network rinkeby scripts/deploy/migrations.js",
     "abis": "node scripts/abis.js",
-    "calldata": "npx hardhat run proposals/utils/getProposalCalldata.js",
-    "check-proposal": "npx hardhat run proposals/utils/checkProposal.js"
+    "calldata": "npx hardhat run scripts/utils/getProposalCalldata.js",
+    "check-proposal": "npx hardhat run scripts/utils/checkProposal.js"
   },
   "author": "joeysantoro",
   "license": "AGPL-3.0-only",

@@ -1,5 +1,5 @@
 const hre = require('hardhat');
-const { forceEth } = require('../../end-to-end/setup/utils.ts');
+const { forceEth } = require('../../test/helpers');
 
 const ERC20 = artifacts.require('ERC20');
 

@@ -1,6 +1,6 @@
 const { expect } = require('chai');
 const hre = require('hardhat');
-const { forceEth } = require('../../end-to-end/setup/utils.ts');
+const { forceEth } = require('../../test/helpers');
 
 const e18 = '000000000000000000';
 const e15 =    '000000000000000';

diff --git a/deploy/aavePCVDeposit.js → scripts/deploy/aavePCVDeposit.js b/deploy/aavePCVDeposit.js → scripts/deploy/aavePCVDeposit.js
diff --git a/deploy/balancerLBP.js → scripts/deploy/balancerLBP.js b/deploy/balancerLBP.js → scripts/deploy/balancerLBP.js
diff --git a/deploy/compoundPCVDeposit.js → scripts/deploy/compoundPCVDeposit.js b/deploy/compoundPCVDeposit.js → scripts/deploy/compoundPCVDeposit.js
diff --git a/deploy/deployMockTribalChief.js → scripts/deploy/deployMockTribalChief.js b/deploy/deployMockTribalChief.js → scripts/deploy/deployMockTribalChief.js
diff --git a/deploy/fip_10a.js → scripts/deploy/fip_10a.js b/deploy/fip_10a.js → scripts/deploy/fip_10a.js
diff --git a/deploy/fip_10b.js → scripts/deploy/fip_10b.js b/deploy/fip_10b.js → scripts/deploy/fip_10b.js
diff --git a/deploy/fip_13.js → scripts/deploy/fip_13.js b/deploy/fip_13.js → scripts/deploy/fip_13.js
diff --git a/deploy/fip_13b.js → scripts/deploy/fip_13b.js b/deploy/fip_13b.js → scripts/deploy/fip_13b.js
diff --git a/deploy/fip_14.js → scripts/deploy/fip_14.js b/deploy/fip_14.js → scripts/deploy/fip_14.js
diff --git a/deploy/fip_15.js → scripts/deploy/fip_15.js b/deploy/fip_15.js → scripts/deploy/fip_15.js
@@ -1,6 +1,6 @@
 /* eslint-disable max-len */
 const { web3 } = require('hardhat');
-const { BN } = require('../test/helpers');
+const { BN } = require('../../test/helpers');
 
 const TribalChief = artifacts.require('TribalChief');
 const TransparentUpgradeableProxy = artifacts.require('TransparentUpgradeableProxy');

diff --git a/deploy/fip_19.js → scripts/deploy/fip_19.js b/deploy/fip_19.js → scripts/deploy/fip_19.js
diff --git a/deploy/fip_20.js → scripts/deploy/fip_20.js b/deploy/fip_20.js → scripts/deploy/fip_20.js
diff --git a/deploy/fip_22.js → scripts/deploy/fip_22.js b/deploy/fip_22.js → scripts/deploy/fip_22.js
diff --git a/deploy/governor.js → scripts/deploy/governor.js b/deploy/governor.js → scripts/deploy/governor.js
diff --git a/deploy/indexOTC.js → scripts/deploy/indexOTC.js b/deploy/indexOTC.js → scripts/deploy/indexOTC.js
diff --git a/deploy/migrations.js → scripts/deploy/migrations.js b/deploy/migrations.js → scripts/deploy/migrations.js
@@ -1,4 +1,4 @@
-import mainnetAddressesV1 from '../contract-addresses/mainnetAddresses.json';
+import mainnetAddressesV1 from '../../contract-addresses/mainnetAddresses.json';
 
 const { web3 } = require('hardhat');
 

diff --git a/deploy/upgrade.js → scripts/deploy/upgrade.js b/deploy/upgrade.js → scripts/deploy/upgrade.js
diff --git a/deploy/v2Phase1.js → scripts/deploy/v2Phase1.js b/deploy/v2Phase1.js → scripts/deploy/v2Phase1.js
diff --git a/proposals/utils/checkProposal.js → scripts/utils/checkProposal.js b/proposals/utils/checkProposal.js → scripts/utils/checkProposal.js
@@ -1,4 +1,4 @@
-import { getMainnetContracts, getContractAddresses } from '../../end-to-end/setup/loadContracts.ts';
+import { getMainnetContracts, getContractAddresses } from '../../test/integration/setup/loadContracts.ts';
 
 const hre = require('hardhat');
 const { time } = require('@openzeppelin/test-helpers');
@@ -72,7 +72,7 @@ async function checkProposal() {
   console.log('Success');
 
   // Get the upgrade setup, run and teardown scripts
-  const { teardown, validate } = await import(`../dao/${proposalName}`);
+  const { teardown, validate } = await import(`../../proposals/dao/${proposalName}`);
 
   const contractAddresses = await getContractAddresses(contracts);
 

diff --git a/proposals/utils/constructProposal.js → scripts/utils/constructProposal.js b/proposals/utils/constructProposal.js → scripts/utils/constructProposal.js
@@ -1,4 +1,4 @@
-import { getMainnetContracts, getEthersContract } from '../../end-to-end/setup/loadContracts.ts';
+import { getMainnetContracts, getEthersContract } from '../../test/integration/setup/loadContracts.ts';
 
 const fs = require('fs');
 
@@ -12,8 +12,8 @@ const { proposals } = require('hardhat');
  * Uses the text in `proposals/description/${proposalName}.txt` for the description
  */ 
 export default async function constructProposal(proposalName, logging = false) {
-  const proposalInfo = await import(`../description/${proposalName}`);
-  const proposalDescription = fs.readFileSync(`${__dirname}/../description/${proposalName}.txt`);
+  const proposalInfo = await import(`../../proposals/description/${proposalName}`);
+  const proposalDescription = fs.readFileSync(`${__dirname}/../../proposals/description/${proposalName}.txt`);
 
   const contracts = await getMainnetContracts();
   const proposalBuilder = proposals.builders.alpha();

diff --git a/proposals/utils/getProposalCalldata.js → scripts/utils/getProposalCalldata.js b/proposals/utils/getProposalCalldata.js → scripts/utils/getProposalCalldata.js
diff --git a/end-to-end/e2e.spec.ts → test/integration/e2e.spec.ts b/end-to-end/e2e.spec.ts → test/integration/e2e.spec.ts
@@ -3,7 +3,7 @@ import { time } from '@openzeppelin/test-helpers';
 import { TestEndtoEndCoordinator } from './setup';
 import { MainnetContractAddresses, MainnetContracts } from './setup/types';
 import { forceEth } from './setup/utils'
-import { BN, expectApprox, expectEvent } from '../test/helpers'
+import { BN, expectApprox, expectEvent } from '../../test/helpers'
 import proposals from './proposals_config.json'
 
 const uintMax = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
@@ -171,6 +171,8 @@ describe('e2e', function () {
     it('splits TRIBE 3 ways', async function () {
       const { tribeSplitter, tribeReserveStabilizer, tribe, erc20Dripper, core } = contracts;
 
+      await tribeSplitter.allocate();
+
       await core.allocateTribe(tribeSplitter.address, '1000000');
 
       const beforeBalanceStabilizer = await tribe.balanceOf(tribeReserveStabilizer.address);

diff --git a/end-to-end/proposals_config.json → test/integration/proposals_config.json b/end-to-end/proposals_config.json → test/integration/proposals_config.json
diff --git a/end-to-end/setup/index.ts → test/integration/setup/index.ts b/end-to-end/setup/index.ts → test/integration/setup/index.ts
@@ -1,4 +1,4 @@
-import permissions from '../../contract-addresses/permissions.json'
+import permissions from '../../../contract-addresses/permissions.json'
 import { getContracts, getContractAddresses, getMainnetContractAddresses } from './loadContracts'
 import {
   Config,
@@ -9,8 +9,8 @@ import {
   Env,
   ProposalConfig
 } from './types'
-import { sudo } from '../../scripts/utils/sudo'
-import constructProposal from '../../proposals/utils/constructProposal';
+import { sudo } from '../../../scripts/utils/sudo'
+import constructProposal from '../../../scripts/utils/constructProposal';
 
 /**
  * Coordinate initialising an end-to-end testing environment
@@ -63,7 +63,7 @@ export class TestEndtoEndCoordinator implements TestCoordinator {
     let deployedUpgradedContracts = {}
 
     if (config["deploy"]) {
-      const { deploy } = await import('../../deploy/' + proposalName);
+      const { deploy } = await import('../../../scripts/deploy/' + proposalName);
       deployedUpgradedContracts = await deploy(this.config.deployAddress, this.mainnetAddresses, this.config.logging)
     }
 
@@ -80,7 +80,7 @@ export class TestEndtoEndCoordinator implements TestCoordinator {
     }
 
     // Get the upgrade setup, run and teardown scripts
-    const { setup, run, teardown, validate } = await import('../../proposals/dao/' + proposalName);
+    const { setup, run, teardown, validate } = await import('../../../proposals/dao/' + proposalName);
 
     // setup the DAO proposal
     await setup(contractAddresses, existingContracts, contracts, this.config.logging);

diff --git a/end-to-end/setup/loadContracts.ts → test/integration/setup/loadContracts.ts b/end-to-end/setup/loadContracts.ts → test/integration/setup/loadContracts.ts
@@ -1,4 +1,4 @@
-import mainnetAddresses from '../../contract-addresses/mainnetAddresses.json'
+import mainnetAddresses from '../../../contract-addresses/mainnetAddresses.json'
 import { artifacts, ethers } from 'hardhat'
 import { MainnetContractAddresses, MainnetContracts } from './types';
 

diff --git a/end-to-end/setup/types.ts → test/integration/setup/types.ts b/end-to-end/setup/types.ts → test/integration/setup/types.ts
diff --git a/end-to-end/setup/utils.ts → test/integration/setup/utils.ts b/end-to-end/setup/utils.ts → test/integration/setup/utils.ts
diff --git a/test/bondingcurve/BondingCurve.test.js → test/unit/bondingcurve/BondingCurve.test.js b/test/bondingcurve/BondingCurve.test.js → test/unit/bondingcurve/BondingCurve.test.js
@@ -6,7 +6,7 @@ const {
   expect,
   getCore,
   getAddresses,
-} = require('../helpers');
+} = require('../../helpers');
 
 const BondingCurve = artifacts.require('BondingCurve');
 const Fei = artifacts.require('Fei');

diff --git a/test/bondingcurve/EthBondingCurve.test.js → ...unit/bondingcurve/EthBondingCurve.test.js b/test/bondingcurve/EthBondingCurve.test.js → ...unit/bondingcurve/EthBondingCurve.test.js
@@ -9,7 +9,7 @@ const {
   expect,
   getAddresses,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const EthBondingCurve = artifacts.require('EthBondingCurve');
 const Fei = artifacts.require('Fei');

diff --git a/test/core/Core.test.js → test/unit/core/Core.test.js b/test/core/Core.test.js → test/unit/core/Core.test.js
@@ -5,7 +5,7 @@ const {
   expect,
   getCore,
   getAddresses,
-} = require('../helpers');
+} = require('../../helpers');
 
 const Tribe = artifacts.require('Tribe');
 const MockCoreRef = artifacts.require('MockCoreRef');

diff --git a/test/dao/OptimisticTimelock.test.js → test/unit/dao/OptimisticTimelock.test.js b/test/dao/OptimisticTimelock.test.js → test/unit/dao/OptimisticTimelock.test.js
@@ -5,7 +5,7 @@ const {
   getCore,
   time,
   expect,
-} = require('../helpers');
+} = require('../../helpers');
 
 const OptimisticTimelock = artifacts.require('OptimisticTimelock');
 

diff --git a/test/dao/TimelockedDelegator.test.js → test/unit/dao/TimelockedDelegator.test.js b/test/dao/TimelockedDelegator.test.js → test/unit/dao/TimelockedDelegator.test.js
@@ -6,7 +6,7 @@ const {
   getAddresses,
   time,
   expect,
-} = require('../helpers');
+} = require('../../helpers');
 
 const TimelockedDelegator = artifacts.require('TimelockedDelegator');
 const MockTribe = artifacts.require('MockTribe');

diff --git a/test/oracle/ChainlinkOracleWrapper.test.js → ...nit/oracle/ChainlinkOracleWrapper.test.js b/test/oracle/ChainlinkOracleWrapper.test.js → ...nit/oracle/ChainlinkOracleWrapper.test.js
@@ -1,4 +1,4 @@
-const { expect, getCore } = require('../helpers');
+const { expect, getCore } = require('../../helpers');
 
 const ChainlinkOracleWrapper = artifacts.require('ChainlinkOracleWrapper');
 const MockChainlinkOracle = artifacts.require('MockChainlinkOracle');

diff --git a/test/oracle/CollateralizationOracle.test.js → ...it/oracle/CollateralizationOracle.test.js b/test/oracle/CollateralizationOracle.test.js → ...it/oracle/CollateralizationOracle.test.js
@@ -5,7 +5,7 @@ const {
   getAddresses,
   expectRevert,
   expectEvent
-} = require('../helpers');
+} = require('../../helpers');
 
 const CollateralizationOracle = artifacts.require('CollateralizationOracle');
 const MockPCVDepositV2 = artifacts.require('MockPCVDepositV2');

diff --git a/...le/CollateralizationOracleWrapper.test.js → ...le/CollateralizationOracleWrapper.test.js b/...le/CollateralizationOracleWrapper.test.js → ...le/CollateralizationOracleWrapper.test.js
@@ -6,7 +6,7 @@ const {
   getAddresses,
   expectRevert,
   expectEvent
-} = require('../helpers');
+} = require('../../helpers');
 
 const CollateralizationOracleWrapper = artifacts.require('CollateralizationOracleWrapper');
 const MockCollateralizationOracle = artifacts.require('MockCollateralizationOracle');

diff --git a/test/oracle/CompositeOracle.test.js → test/unit/oracle/CompositeOracle.test.js b/test/oracle/CompositeOracle.test.js → test/unit/oracle/CompositeOracle.test.js
@@ -3,7 +3,7 @@ const {
   expect,
   getAddresses,
   getCore
-} = require('../helpers');
+} = require('../../helpers');
 
 const CompositeOracle = artifacts.require('CompositeOracle');
 const MockOracle = artifacts.require('MockOracle');

diff --git a/test/oracle/ConstantOracle.test.js → test/unit/oracle/ConstantOracle.test.js b/test/oracle/ConstantOracle.test.js → test/unit/oracle/ConstantOracle.test.js
@@ -1,4 +1,4 @@
-const { expect, getCore, getAddresses } = require('../helpers');
+const { expect, getCore, getAddresses } = require('../../helpers');
 
 const ConstantOracle = artifacts.require('ConstantOracle');
 

diff --git a/test/oracle/UniswapOracle.test.js → test/unit/oracle/UniswapOracle.test.js b/test/oracle/UniswapOracle.test.js → test/unit/oracle/UniswapOracle.test.js
@@ -6,7 +6,7 @@ const {
   expect,
   getAddresses,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const UniswapOracle = artifacts.require('UniswapOracle');
 const MockPairTrade = artifacts.require('MockUniswapV2PairTrade');

diff --git a/test/pcv/AavePCVDeposit.test.js → test/unit/pcv/AavePCVDeposit.test.js b/test/pcv/AavePCVDeposit.test.js → test/unit/pcv/AavePCVDeposit.test.js
@@ -6,7 +6,7 @@ const {
   expect,
   getAddresses,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const AavePCVDeposit = artifacts.require('AavePCVDeposit');
 const MockLendingPool = artifacts.require('MockLendingPool');

diff --git a/test/pcv/ERC20CompoundPCVDeposit.test.js → .../unit/pcv/ERC20CompoundPCVDeposit.test.js b/test/pcv/ERC20CompoundPCVDeposit.test.js → .../unit/pcv/ERC20CompoundPCVDeposit.test.js
@@ -4,7 +4,7 @@ const {
   expect,
   getAddresses,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const ERC20CompoundPCVDeposit = artifacts.require('ERC20CompoundPCVDeposit');
 const MockCToken = artifacts.require('MockCToken');

diff --git a/test/pcv/ERC20Dripper.test.js → test/unit/pcv/ERC20Dripper.test.js b/test/pcv/ERC20Dripper.test.js → test/unit/pcv/ERC20Dripper.test.js
@@ -14,7 +14,7 @@ const {
   expect,
   getAddresses,
   expectApprox,
-} = require('../helpers');
+} = require('../../helpers');
 
 const Tribe = artifacts.require('MockTribe');
 const MockCoreRef = artifacts.require('MockCoreRef');

diff --git a/test/pcv/ERC20Splitter.test.js → test/unit/pcv/ERC20Splitter.test.js b/test/pcv/ERC20Splitter.test.js → test/unit/pcv/ERC20Splitter.test.js
@@ -4,7 +4,7 @@ const {
   expect,
   getAddresses,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const ERC20Splitter = artifacts.require('ERC20Splitter');
 const Tribe = artifacts.require('Tribe');

diff --git a/test/pcv/EthCompoundPCVDeposit.test.js → test/unit/pcv/EthCompoundPCVDeposit.test.js b/test/pcv/EthCompoundPCVDeposit.test.js → test/unit/pcv/EthCompoundPCVDeposit.test.js
@@ -6,7 +6,7 @@ const {
   expect,
   getAddresses,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const EthCompoundPCVDeposit = artifacts.require('EthCompoundPCVDeposit');
 const MockCToken = artifacts.require('MockCToken');

diff --git a/test/pcv/EthLidoPCVDeposit.test.js → test/unit/pcv/EthLidoPCVDeposit.test.js b/test/pcv/EthLidoPCVDeposit.test.js → test/unit/pcv/EthLidoPCVDeposit.test.js
@@ -8,7 +8,7 @@ const {
   getAddresses,
   getCore,
   forceEth
-} = require('../helpers');
+} = require('../../helpers');
 
 const EthLidoPCVDeposit = artifacts.require('EthLidoPCVDeposit');
 const Fei = artifacts.require('Fei');

diff --git a/test/pcv/PCVDepositWrapper.test.js → test/unit/pcv/PCVDepositWrapper.test.js b/test/pcv/PCVDepositWrapper.test.js → test/unit/pcv/PCVDepositWrapper.test.js
@@ -1,7 +1,7 @@
 const {
   expect,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const PCVDepositWrapper = artifacts.require('PCVDepositWrapper');
 const MockPCVDepositV2 = artifacts.require('MockPCVDepositV2');

diff --git a/test/pcv/PCVDripController.test.js → test/unit/pcv/PCVDripController.test.js b/test/pcv/PCVDripController.test.js → test/unit/pcv/PCVDripController.test.js
@@ -7,7 +7,7 @@ const {
   expect,
   getAddresses,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const PCVDripController = artifacts.require('PCVDripController');
 const MockPCVDeposit = artifacts.require('MockEthUniswapPCVDeposit');

diff --git a/test/pcv/PCVSwapperUniswap.test.js → test/unit/pcv/PCVSwapperUniswap.test.js b/test/pcv/PCVSwapperUniswap.test.js → test/unit/pcv/PCVSwapperUniswap.test.js
@@ -9,7 +9,7 @@ const {
   expect,
   getAddresses,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const PCVSwapperUniswap = artifacts.require('PCVSwapperUniswap');
 const ChainlinkOracleWrapper = artifacts.require('ChainlinkOracleWrapper');

diff --git a/test/pcv/RatioPCVController.test.js → test/unit/pcv/RatioPCVController.test.js b/test/pcv/RatioPCVController.test.js → test/unit/pcv/RatioPCVController.test.js
@@ -6,7 +6,7 @@ const {
   getAddresses,
   getCore,
   web3,
-} = require('../helpers');
+} = require('../../helpers');
 
 const RatioPCVController = artifacts.require('RatioPCVController');
 const MockERC20 = artifacts.require('MockERC20');

diff --git a/test/pcv/StableSwapOperatorV1.test.js → test/unit/pcv/StableSwapOperatorV1.test.js b/test/pcv/StableSwapOperatorV1.test.js → test/unit/pcv/StableSwapOperatorV1.test.js
@@ -6,7 +6,7 @@ const {
   expect,
   getAddresses,
   getCore
-} = require('../helpers');
+} = require('../../helpers');
 
 const StableSwapOperatorV1 = artifacts.require('StableSwapOperatorV1');
 const MockCurve3pool = artifacts.require('MockCurve3pool');

diff --git a/test/pcv/StaticPCVDepositWrapper.test.js → .../unit/pcv/StaticPCVDepositWrapper.test.js b/test/pcv/StaticPCVDepositWrapper.test.js → .../unit/pcv/StaticPCVDepositWrapper.test.js
@@ -3,7 +3,7 @@ const {
   getCore,
   getAddresses,
   expectRevert,
-} = require('../helpers');
+} = require('../../helpers');
 
 const StaticPCVDepositWrapper = artifacts.require('StaticPCVDepositWrapper');
 

diff --git a/test/pcv/UniswapPCVController.test.js → test/unit/pcv/UniswapPCVController.test.js b/test/pcv/UniswapPCVController.test.js → test/unit/pcv/UniswapPCVController.test.js
@@ -7,7 +7,7 @@ const {
   expect,
   getAddresses,
   getCore
-} = require('../helpers');
+} = require('../../helpers');
 
 const UniswapPCVController = artifacts.require('UniswapPCVController');
 const Fei = artifacts.require('Fei');

diff --git a/test/pcv/UniswapPCVDeposit.test.js → test/unit/pcv/UniswapPCVDeposit.test.js b/test/pcv/UniswapPCVDeposit.test.js → test/unit/pcv/UniswapPCVDeposit.test.js
@@ -7,7 +7,7 @@ const {
   expect,
   getAddresses,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const UniswapPCVDeposit = artifacts.require('UniswapPCVDeposit');
 const Fei = artifacts.require('Fei');

diff --git a/test/refs/OracleRef.test.js → test/unit/refs/OracleRef.test.js b/test/refs/OracleRef.test.js → test/unit/refs/OracleRef.test.js
@@ -5,7 +5,7 @@ const {
   BN,
   getAddresses,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const ReserveStabilizer = artifacts.require('ReserveStabilizer');
 const MockOracle = artifacts.require('MockOracle');

diff --git a/test/stablizer/EthReserveStabilizer.test.js → ...it/stablizer/EthReserveStabilizer.test.js b/test/stablizer/EthReserveStabilizer.test.js → ...it/stablizer/EthReserveStabilizer.test.js
@@ -8,7 +8,7 @@ const {
   expect,
   getAddresses,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const EthReserveStabilizer = artifacts.require('EthReserveStabilizer');
 const Fei = artifacts.require('Fei');

diff --git a/test/stablizer/ReserveStabilizer.test.js → .../unit/stablizer/ReserveStabilizer.test.js b/test/stablizer/ReserveStabilizer.test.js → .../unit/stablizer/ReserveStabilizer.test.js
@@ -4,7 +4,7 @@ const {
   expect,
   getAddresses,
   getCore,
-} = require('../helpers');
+} = require('../../helpers');
 
 const ReserveStabilizer = artifacts.require('ReserveStabilizer');
 const Fei = artifacts.require('Fei');