diff --git a/migrations_scripts/1_deploy_registry_and_add_adapters.js b/migrations_scripts/1_deploy_registry_and_add_adapters.js index de271e38..e1c12bc8 100755 --- a/migrations_scripts/1_deploy_registry_and_add_adapters.js +++ b/migrations_scripts/1_deploy_registry_and_add_adapters.js @@ -14,6 +14,7 @@ const ChaiAdapter = artifacts.require('ChaiAdapter'); const DSRAdapter = artifacts.require('DSRAdapter'); const MCDAssetAdapter = artifacts.require('MCDAssetAdapter'); const MCDDebtAdapter = artifacts.require('MCDDebtAdapter'); +const PieDAOPieAdapter = artifacts.require('PieDAOPieAdapter'); const PoolTogetherAdapter = artifacts.require('PoolTogetherAdapter'); const SynthetixAssetAdapter = artifacts.require('SynthetixAssetAdapter'); const SynthetixDebtAdapter = artifacts.require('SynthetixDebtAdapter'); @@ -30,6 +31,7 @@ const DmmTokenAdapter = artifacts.require('DmmTokenAdapter'); const IdleTokenAdapter = artifacts.require('IdleTokenAdapter'); const IearnTokenAdapter = artifacts.require('IearnTokenAdapter'); const ChaiTokenAdapter = artifacts.require('ChaiTokenAdapter'); +const PieDAOPieTokenAdapter = artifacts.require('PieDAOPieTokenAdapter'); const PoolTogetherTokenAdapter = artifacts.require('PoolTogetherTokenAdapter'); const TokenSetsTokenAdapter = artifacts.require('TokenSetsTokenAdapter'); const UniswapV1TokenAdapter = artifacts.require('UniswapV1TokenAdapter'); @@ -113,6 +115,8 @@ const usdcPoolAddress = '0x0034Ea9808E620A0EF79261c51AF20614B742B24'; const chaiAddress = '0x06AF07097C9Eeb7fD685c692751D5C66dB49c215'; +const BTCPPAddress = '0x0327112423F3A68efdF1fcF402F6c5CB9f7C33fd'; + const aaveAssetAdapterTokens = [ aDaiAddress, aTusdAddress, @@ -218,6 +222,9 @@ const mcdAssetAdapterTokens = [ const mcdDebtAdapterTokens = [ daiAddress, ]; +const pieDAOPieAdapterTokens = [ + BTCPPAddress, +]; const poolTogetherAdapterTokens = [ saiPoolAddress, daiPoolAddress, @@ -412,6 +419,18 @@ module.exports = async (deployer, network, accounts) => { '0', ]); + await deployer.deploy(PieDAOPieAdapter, { from: accounts[0] }); + adapters.push([PieDAOPieAdapter.address]); + tokens.push([pieDAOPieAdapterTokens]); + protocolNames.push('PieDAO'); + metadata.push([ + 'PieDAO BTC++', + 'BTC on Ethereum diversified', + 'btc.piedao.org', + 'protocol-icons.s3.us-east-1.amazonaws.com/piedao.png', + '0', + ]); + await deployer.deploy(SynthetixAssetAdapter, { from: accounts[0] }); await deployer.deploy(SynthetixDebtAdapter, { from: accounts[0] }); adapters.push([SynthetixAssetAdapter.address, SynthetixDebtAdapter.address]); @@ -521,6 +540,12 @@ module.exports = async (deployer, network, accounts) => { ChaiTokenAdapter.address, ); }); + await deployer.deploy(PieDAOPieTokenAdapter, { from: accounts[0] }) + .then(() => { + tokenAdapters.push( + PieDAOPieTokenAdapter.address, + ); + }); await deployer.deploy(PoolTogetherTokenAdapter, { from: accounts[0] }) .then(() => { tokenAdapters.push( diff --git a/migrations_scripts/1_use_registry_and_add_adapters.js b/migrations_scripts/1_use_registry_and_add_adapters.js index 38c3068f..43a2601d 100755 --- a/migrations_scripts/1_use_registry_and_add_adapters.js +++ b/migrations_scripts/1_use_registry_and_add_adapters.js @@ -14,6 +14,7 @@ const ChaiAdapter = artifacts.require('ChaiAdapter'); const DSRAdapter = artifacts.require('DSRAdapter'); const MCDAssetAdapter = artifacts.require('MCDAssetAdapter'); const MCDDebtAdapter = artifacts.require('MCDDebtAdapter'); +const PieDAOPieAdapter = artifacts.require('PieDAOPieAdapter'); const PoolTogetherAdapter = artifacts.require('PoolTogetherAdapter'); const SynthetixAssetAdapter = artifacts.require('SynthetixAssetAdapter'); const SynthetixDebtAdapter = artifacts.require('SynthetixDebtAdapter'); @@ -30,6 +31,7 @@ const DmmTokenAdapter = artifacts.require('DmmTokenAdapter'); const IdleTokenAdapter = artifacts.require('IdleTokenAdapter'); const IearnTokenAdapter = artifacts.require('IearnTokenAdapter'); const ChaiTokenAdapter = artifacts.require('ChaiTokenAdapter'); +const PieDAOPieTokenAdapter = artifacts.require('PieDAOPieTokenAdapter'); const PoolTogetherTokenAdapter = artifacts.require('PoolTogetherTokenAdapter'); const TokenSetsTokenAdapter = artifacts.require('TokenSetsTokenAdapter'); const UniswapV1TokenAdapter = artifacts.require('UniswapV1TokenAdapter'); @@ -113,6 +115,8 @@ const usdcPoolAddress = '0x0034Ea9808E620A0EF79261c51AF20614B742B24'; const chaiAddress = '0x06AF07097C9Eeb7fD685c692751D5C66dB49c215'; +const BTCPPAddress = '0x0327112423F3A68efdF1fcF402F6c5CB9f7C33fd'; + const aaveAssetAdapterTokens = [ aDaiAddress, aTusdAddress, @@ -218,6 +222,9 @@ const mcdAssetAdapterTokens = [ const mcdDebtAdapterTokens = [ daiAddress, ]; +const pieDAOPieAdapterTokens = [ + BTCPPAddress, +]; const poolTogetherAdapterTokens = [ saiPoolAddress, daiPoolAddress, @@ -412,6 +419,18 @@ module.exports = async (deployer, network, accounts) => { '0', ]); + await deployer.deploy(PieDAOPieAdapter, { from: accounts[0] }); + adapters.push([PieDAOPieAdapter.address]); + tokens.push([pieDAOPieAdapterTokens]); + protocolNames.push('PieDAO'); + metadata.push([ + 'PieDAO BTC++', + 'BTC on Ethereum diversified', + 'btc.piedao.org', + 'protocol-icons.s3.us-east-1.amazonaws.com/piedao.png', + '0', + ]); + await deployer.deploy(SynthetixAssetAdapter, { from: accounts[0] }); await deployer.deploy(SynthetixDebtAdapter, { from: accounts[0] }); adapters.push([SynthetixAssetAdapter.address, SynthetixDebtAdapter.address]); @@ -521,6 +540,12 @@ module.exports = async (deployer, network, accounts) => { ChaiTokenAdapter.address, ); }); + await deployer.deploy(PieDAOPieTokenAdapter, { from: accounts[0] }) + .then(() => { + tokenAdapters.push( + PieDAOPieTokenAdapter.address, + ); + }); await deployer.deploy(PoolTogetherTokenAdapter, { from: accounts[0] }) .then(() => { tokenAdapters.push( diff --git a/migrations_scripts/1_use_registry_and_add_deployed_adapter.js b/migrations_scripts/1_use_registry_and_add_deployed_adapter.js index 56913676..3a8ac75e 100755 --- a/migrations_scripts/1_use_registry_and_add_deployed_adapter.js +++ b/migrations_scripts/1_use_registry_and_add_deployed_adapter.js @@ -8,7 +8,7 @@ let tokenAdapters = []; module.exports = async (deployer, network, accounts) => { adapters.push(['']); - tokens.push([dmmAssetAdapterTokens]); + tokens.push([[]]); protocolNames.push('Initial protocol name'); metadata.push([ 'Name', diff --git a/package.json b/package.json index d89e5065..a9a1b3b3 100755 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "eth-gas-reporter": "0.2.17", "ethlint": "1.2.5", "ganache-cli": "6.9.1", - "solhint": "2.3.1", + "solhint": "3.0.0-rc.8", "solidity-coverage": "0.7.4" } } diff --git a/test/AaveAssetAdapter.js b/test/AaveAssetAdapter.js index 799c3c5d..c1d63f10 100755 --- a/test/AaveAssetAdapter.js +++ b/test/AaveAssetAdapter.js @@ -1,9 +1,9 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./AaveAssetAdapter'); -const TokenAdapter = artifacts.require('./AaveTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('AaveAssetAdapter'); +const TokenAdapter = artifacts.require('AaveTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('AaveAssetAdapter', () => { const aDAIAddress = '0xfC1E690f61EFd961294b3e1Ce3313fBD8aa4f85d'; diff --git a/test/AaveDebtAdapter.js b/test/AaveDebtAdapter.js index 8a3146ee..d76c89d3 100755 --- a/test/AaveDebtAdapter.js +++ b/test/AaveDebtAdapter.js @@ -1,8 +1,8 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./AaveDebtAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('AaveDebtAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('AaveDebtAdapter', () => { const daiAddress = '0x6B175474E89094C44Da98b954EedeAC495271d0F'; diff --git a/test/AdapterRegistry.js b/test/AdapterRegistry.js index 91755b5e..770a3b99 100755 --- a/test/AdapterRegistry.js +++ b/test/AdapterRegistry.js @@ -1,8 +1,8 @@ import expectRevert from './helpers/expectRevert'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./MockAdapter'); -const TokenAdapter = artifacts.require('./MockTokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('MockAdapter'); +const TokenAdapter = artifacts.require('MockTokenAdapter'); const ZERO = '0x0000000000000000000000000000000000000000'; const ONE = '0x1111111111111111111111111111111111111111'; diff --git a/test/AdapterRegistryDeployed.js b/test/AdapterRegistryDeployed.js index 18702d47..e34a6c83 100755 --- a/test/AdapterRegistryDeployed.js +++ b/test/AdapterRegistryDeployed.js @@ -1,4 +1,4 @@ -const AdapterRegistry = artifacts.require('./AdapterRegistry'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); contract.skip('AdapterRegistry deployed', () => { let adapterRegistry; @@ -22,6 +22,7 @@ contract.skip('AdapterRegistry deployed', () => { 'TokenSets', 'Synthetix', 'PoolTogether', + 'PieDAO', 'Multi-Collateral Dai', 'Dai Savings Protocol', 'Chai', @@ -48,6 +49,7 @@ contract.skip('AdapterRegistry deployed', () => { 'SmartToken', 'SetToken', 'PoolTogether pool', + 'PieDAO Pie Token', 'Chai token', 'YToken', 'IdleToken', diff --git a/test/BalancerAdapter.js b/test/BalancerAdapter.js index e0ba778d..41861ead 100755 --- a/test/BalancerAdapter.js +++ b/test/BalancerAdapter.js @@ -1,10 +1,10 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./BalancerAdapter'); -const TokenAdapter = artifacts.require('./BalancerTokenAdapter'); -const CompoundTokenAdapter = artifacts.require('./CompoundTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('BalancerAdapter'); +const TokenAdapter = artifacts.require('BalancerTokenAdapter'); +const CompoundTokenAdapter = artifacts.require('CompoundTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('BalancerAdapter', () => { const wethDai3070PoolAddress = '0x53b89CE35928dda346c574D9105A5479CB87231c'; diff --git a/test/BancorAdapter.js b/test/BancorAdapter.js index 54c63a2b..46b92443 100755 --- a/test/BancorAdapter.js +++ b/test/BancorAdapter.js @@ -1,9 +1,9 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./BancorAdapter'); -const TokenAdapter = artifacts.require('./BancorTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('BancorAdapter'); +const TokenAdapter = artifacts.require('BancorTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('BalancerAdapter', () => { const bntBethPoolAddress = '0xb1CD6e4153B2a390Cf00A6556b0fC1458C4A5533'; diff --git a/test/ChaiAdapter.js b/test/ChaiAdapter.js index 245d2af9..d3fe29e0 100755 --- a/test/ChaiAdapter.js +++ b/test/ChaiAdapter.js @@ -1,9 +1,9 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./ChaiAdapter'); -const TokenAdapter = artifacts.require('./ChaiTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('ChaiAdapter'); +const TokenAdapter = artifacts.require('ChaiTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('ChaiAdapter', () => { const chaiAddress = '0x06AF07097C9Eeb7fD685c692751D5C66dB49c215'; diff --git a/test/CompoundAssetAdapter.js b/test/CompoundAssetAdapter.js index d6e62e1c..0064ec5d 100755 --- a/test/CompoundAssetAdapter.js +++ b/test/CompoundAssetAdapter.js @@ -1,9 +1,9 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./CompoundAssetAdapter'); -const TokenAdapter = artifacts.require('./CompoundTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('CompoundAssetAdapter'); +const TokenAdapter = artifacts.require('CompoundTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('CompoundAssetAdapter', () => { const cDAIAddress = '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643'; diff --git a/test/CompoundDebtAdapter.js b/test/CompoundDebtAdapter.js index 32a0e068..424fc97b 100755 --- a/test/CompoundDebtAdapter.js +++ b/test/CompoundDebtAdapter.js @@ -1,8 +1,8 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./CompoundDebtAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('CompoundDebtAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('CompoundDebtAdapter', () => { const daiAddress = '0x6B175474E89094C44Da98b954EedeAC495271d0F'; diff --git a/test/CurveAdapter.js b/test/CurveAdapter.js index 3f800db6..3b7d7b8b 100755 --- a/test/CurveAdapter.js +++ b/test/CurveAdapter.js @@ -1,11 +1,11 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./CurveAdapter'); -const TokenAdapter = artifacts.require('./CurveTokenAdapter'); -const CTokenAdapter = artifacts.require('./CompoundTokenAdapter'); -const YTokenAdapter = artifacts.require('./IearnTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('CurveAdapter'); +const TokenAdapter = artifacts.require('CurveTokenAdapter'); +const CTokenAdapter = artifacts.require('CompoundTokenAdapter'); +const YTokenAdapter = artifacts.require('IearnTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('CurveAdapter', () => { const ssCompoundTokenAddress = '0x845838DF265Dcd2c412A1Dc9e959c7d08537f8a2'; diff --git a/test/DSRAdapter.js b/test/DSRAdapter.js index 975ec0c0..314bfc79 100755 --- a/test/DSRAdapter.js +++ b/test/DSRAdapter.js @@ -1,8 +1,8 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./DSRAdapter'); -const TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('DSRAdapter'); +const TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('DSRAdapter', () => { const daiAddress = '0x6B175474E89094C44Da98b954EedeAC495271d0F'; diff --git a/test/DmmAssetAdapter.js b/test/DmmAssetAdapter.js index adc46a82..54b99bea 100644 --- a/test/DmmAssetAdapter.js +++ b/test/DmmAssetAdapter.js @@ -1,9 +1,9 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./DmmAssetAdapter'); -const TokenAdapter = artifacts.require('./DmmTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('DmmAssetAdapter'); +const TokenAdapter = artifacts.require('DmmTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('DmmAssetAdapter', () => { const mDAIAddress = '0x06301057D77D54B6e14c7FafFB11Ffc7Cab4eaa7'; diff --git a/test/DyDxAssetAdapter.js b/test/DyDxAssetAdapter.js index bb88d217..ca28abd9 100755 --- a/test/DyDxAssetAdapter.js +++ b/test/DyDxAssetAdapter.js @@ -1,8 +1,8 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./DyDxAssetAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('DyDxAssetAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('DyDxAssetAdapter', () => { const wethAddress = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'; diff --git a/test/DyDxDebtAdapter.js b/test/DyDxDebtAdapter.js index 47578a0b..6b86de51 100755 --- a/test/DyDxDebtAdapter.js +++ b/test/DyDxDebtAdapter.js @@ -1,8 +1,8 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./DyDxDebtAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('DyDxDebtAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('DyDxDebtAdapter', () => { const wethAddress = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'; diff --git a/test/ERC20TokenAdapter.js b/test/ERC20TokenAdapter.js index 79912cfb..72351703 100755 --- a/test/ERC20TokenAdapter.js +++ b/test/ERC20TokenAdapter.js @@ -1,8 +1,8 @@ // import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./SynthetixAssetAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('SynthetixAssetAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('ERC20TokenAdapter', () => { const badAddress = '0x101571584659dC31bF3E3E5E29F55D8BdfBAecEC'; diff --git a/test/IdleAdapter.js b/test/IdleAdapter.js index 06a889ef..dfbd0b8c 100644 --- a/test/IdleAdapter.js +++ b/test/IdleAdapter.js @@ -1,9 +1,9 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./IdleAdapter'); -const TokenAdapter = artifacts.require('./IdleTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('IdleAdapter'); +const TokenAdapter = artifacts.require('IdleTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('IdleAdapter', () => { const daiAddress = '0x6B175474E89094C44Da98b954EedeAC495271d0F'; diff --git a/test/IearnAdapter.js b/test/IearnAdapter.js index 550aed6f..2b4f3c3a 100755 --- a/test/IearnAdapter.js +++ b/test/IearnAdapter.js @@ -1,9 +1,9 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./IearnAdapter'); -const TokenAdapter = artifacts.require('./IearnTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('IearnAdapter'); +const TokenAdapter = artifacts.require('IearnTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('IearnAdapter', () => { const daiAddress = '0x6B175474E89094C44Da98b954EedeAC495271d0F'; diff --git a/test/MCDAssetAdapter.js b/test/MCDAssetAdapter.js index 4f0f8d54..445203cf 100755 --- a/test/MCDAssetAdapter.js +++ b/test/MCDAssetAdapter.js @@ -1,9 +1,9 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./MCDAssetAdapter'); -const DebtProtocolAdapter = artifacts.require('./MCDDebtAdapter'); -const TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('MCDAssetAdapter'); +const DebtProtocolAdapter = artifacts.require('MCDDebtAdapter'); +const TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('MCDAssetAdapter', () => { const wethAddress = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'; diff --git a/test/MCDDebtAdapter.js b/test/MCDDebtAdapter.js index 25c1a1f8..2934d4d1 100755 --- a/test/MCDDebtAdapter.js +++ b/test/MCDDebtAdapter.js @@ -1,8 +1,8 @@ // import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./MCDDebtAdapter'); -const TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('MCDDebtAdapter'); +const TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('MCDDebtAdapter', () => { const daiAddress = '0x6B175474E89094C44Da98b954EedeAC495271d0F'; // for debt diff --git a/test/PieDAOPieAdapter.js b/test/PieDAOPieAdapter.js index 82bae1c1..9d771e17 100755 --- a/test/PieDAOPieAdapter.js +++ b/test/PieDAOPieAdapter.js @@ -1,9 +1,9 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./PieDAOPieAdapter'); -const TokenAdapter = artifacts.require('./PieDAOPieTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('PieDAOPieAdapter'); +const TokenAdapter = artifacts.require('PieDAOPieTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('PieDAOPieAdapter', () => { const BTCPPAddress = '0x0327112423F3A68efdF1fcF402F6c5CB9f7C33fd'; @@ -11,7 +11,7 @@ contract('PieDAOPieAdapter', () => { const pbtcAddress = '0x5228a22e72ccC52d415EcFd199F99D0665E7733b'; const imbtcAddress = '0x3212b29E33587A00FB1C83346f5dBFA69A458923'; const sbtcAddress = '0xfE18be6b3Bd88A2D2A7f928d00292E7a9963CfC6'; - + const testAddress = '0xd4DBF96Db2FDf8ED40296d8d104b371aDF7dEE12'; let accounts; @@ -19,7 +19,7 @@ contract('PieDAOPieAdapter', () => { let protocolAdapterAddress; let tokenAdapterAddress; let erc20TokenAdapterAddress; - + const btcpp = [ BTCPPAddress, 'PieDAO BTC++', @@ -82,7 +82,7 @@ contract('PieDAOPieAdapter', () => { protocolAdapterAddress, ]], [[[ - BTCPPAddress + BTCPPAddress, ]]], ) .send({ diff --git a/test/PoolTogetherAdapter.js b/test/PoolTogetherAdapter.js index 5d0305bb..672756aa 100755 --- a/test/PoolTogetherAdapter.js +++ b/test/PoolTogetherAdapter.js @@ -1,9 +1,9 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./PoolTogetherAdapter'); -const TokenAdapter = artifacts.require('./PoolTogetherTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('PoolTogetherAdapter'); +const TokenAdapter = artifacts.require('PoolTogetherTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('PoolTogetherAdapter', () => { const daiAddress = '0x6B175474E89094C44Da98b954EedeAC495271d0F'; diff --git a/test/SynthetixAssetAdapter.js b/test/SynthetixAssetAdapter.js index e2891165..43380e46 100755 --- a/test/SynthetixAssetAdapter.js +++ b/test/SynthetixAssetAdapter.js @@ -1,8 +1,8 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./SynthetixAssetAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('SynthetixAssetAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('SynthetixAssetAdapter', () => { const snxAddress = '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F'; diff --git a/test/SynthetixDebtAdapter.js b/test/SynthetixDebtAdapter.js index fe3f5f4e..901af7b3 100755 --- a/test/SynthetixDebtAdapter.js +++ b/test/SynthetixDebtAdapter.js @@ -1,8 +1,8 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./SynthetixDebtAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('SynthetixDebtAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('SynthetixDebtAdapter', () => { const susdAddress = '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51'; diff --git a/test/TokenSetsAdapter.js b/test/TokenSetsAdapter.js index 6a66e5f2..d55167f1 100755 --- a/test/TokenSetsAdapter.js +++ b/test/TokenSetsAdapter.js @@ -1,9 +1,9 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./TokenSetsAdapter'); -const TokenAdapter = artifacts.require('./TokenSetsTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('TokenSetsAdapter'); +const TokenAdapter = artifacts.require('TokenSetsTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('TokenSetsAdapter', () => { const ETH12DayEMACrossoverSet = '0x2c5a9980B41861D91D30d0E0271d1c093452DcA5'; diff --git a/test/UniswapV1Adapter.js b/test/UniswapV1Adapter.js index bab0e795..49b33cd8 100755 --- a/test/UniswapV1Adapter.js +++ b/test/UniswapV1Adapter.js @@ -1,10 +1,10 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./UniswapV1Adapter'); -const TokenAdapter = artifacts.require('./UniswapV1TokenAdapter'); -const CompoundTokenAdapter = artifacts.require('./CompoundTokenAdapter'); -const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('UniswapV1Adapter'); +const TokenAdapter = artifacts.require('UniswapV1TokenAdapter'); +const CompoundTokenAdapter = artifacts.require('CompoundTokenAdapter'); +const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('UniswapV1Adapter', () => { const batUniAddress = '0x2E642b8D59B45a1D8c5aEf716A84FF44ea665914'; diff --git a/test/ZrxAdapter.js b/test/ZrxAdapter.js index 6f0d11a3..b755e690 100755 --- a/test/ZrxAdapter.js +++ b/test/ZrxAdapter.js @@ -1,8 +1,8 @@ import displayToken from './helpers/displayToken'; -const AdapterRegistry = artifacts.require('./AdapterRegistry'); -const ProtocolAdapter = artifacts.require('./ZrxAdapter'); -const TokenAdapter = artifacts.require('./ERC20TokenAdapter'); +const AdapterRegistry = artifacts.require('AdapterRegistry'); +const ProtocolAdapter = artifacts.require('ZrxAdapter'); +const TokenAdapter = artifacts.require('ERC20TokenAdapter'); contract('ZrxAdapter', () => { const zrxAddress = '0xE41d2489571d322189246DaFA5ebDe1F4699F498';