crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failing tests

Browse Source
This commit is contained in:
Amir Bandeali
2019-12-03 08:46:47 -08:00
parent 173ba9b2b5
commit b68acd101e
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/asset-proxy/contracts/src/interfaces/IChai.sol
View File

@@ -18,6 +18,7 @@
pragma solidity ^0.5.9;
// The actual Chai contract can be found here: https://github.com/dapphub/chai
contract IChai {

5
contracts/asset-proxy/contracts/test/TestChaiBridge.sol
View File

@@ -26,7 +26,7 @@ import "@0x/contracts-erc20/contracts/src/ERC20Token.sol";
contract TestChaiDai is
ERC20Token
{
address private ALWAYS_REVERT_ADDRESS = address(1);
address private constant ALWAYS_REVERT_ADDRESS = address(1);
function draw(
address from,
@@ -41,11 +41,12 @@ contract TestChaiDai is
}
}
contract TestChaiBridge is
ChaiBridge
{
address public testChaiDai;
address private ALWAYS_REVERT_ADDRESS = address(1);
address private constant ALWAYS_REVERT_ADDRESS = address(1);
constructor()
public

7
contracts/integrations/contracts/test/TestEth2DaiBridge.sol
View File

@@ -20,7 +20,6 @@ pragma solidity ^0.5.9;
pragma experimental ABIEncoderV2;
import "@0x/contracts-asset-proxy/contracts/src/bridges/Eth2DaiBridge.sol";
import "@0x/contracts-asset-proxy/contracts/src/interfaces/IEth2Dai.sol";
contract TestEth2DaiBridge is
@@ -35,11 +34,11 @@ contract TestEth2DaiBridge is
TEST_ETH2DAI_ADDRESS = testEth2Dai;
}
function _getEth2DaiContract()
function _getEth2DaiAddress()
internal
view
returns (IEth2Dai exchange)
returns (address exchange)
{
return IEth2Dai(TEST_ETH2DAI_ADDRESS);
return TEST_ETH2DAI_ADDRESS;
}
}

18
contracts/integrations/contracts/test/TestUniswapBridge.sol
View File

@@ -20,8 +20,6 @@ pragma solidity ^0.5.9;
pragma experimental ABIEncoderV2;
import "@0x/contracts-asset-proxy/contracts/src/bridges/UniswapBridge.sol";
import "@0x/contracts-asset-proxy/contracts/src/interfaces/IUniswapExchangeFactory.sol";
import "@0x/contracts-erc20/contracts/src/interfaces/IEtherToken.sol";
contract TestUniswapBridge is
@@ -41,19 +39,19 @@ contract TestUniswapBridge is
TEST_UNISWAP_EXCHANGE_FACTORY_ADDRESS = testUniswapExchangeFactory;
}
function getWethContract()
public
function _getWethAddress()
internal
view
returns (IEtherToken token)
returns (address token)
{
return IEtherToken(TEST_WETH_ADDRESS);
return TEST_WETH_ADDRESS;
}
function getUniswapExchangeFactoryContract()
public
function _getUniswapExchangeFactoryAddress()
internal
view
returns (IUniswapExchangeFactory factory)
returns (address factory)
{
return IUniswapExchangeFactory(TEST_UNISWAP_EXCHANGE_FACTORY_ADDRESS);
return TEST_UNISWAP_EXCHANGE_FACTORY_ADDRESS;
}
}