remove fund functions and add tests

Author: andersonlee111

contracts/ERC20Safe.sol

@@ -13,17 +13,6 @@ import "@openzeppelin/contracts/token/ERC20/ERC20Burnable.sol";
 contract ERC20Safe {
     using SafeMath for uint256;
 
-    /**
-        @notice Used to transfer tokens into the safe to fund proposals.
-        @param tokenAddress Address of ERC20 to transfer.
-        @param owner Address of current token owner.
-        @param amount Amount of tokens to transfer.
-     */
-    function fundERC20(address tokenAddress, address owner, uint256 amount) public {
-        IERC20 erc20 = IERC20(tokenAddress);
-        _safeTransferFrom(erc20, owner, address(this), amount);
-    }
-
     /**
         @notice Used to gain custody of deposited token.
         @param tokenAddress Address of ERC20 to transfer.

contracts/ERC721Safe.sol

@@ -12,17 +12,6 @@ import "./ERC721MinterBurnerPauser.sol";
 contract ERC721Safe {
     using SafeMath for uint256;
 
-    /**
-        @notice Used to transfer tokens into the safe to fund proposals.
-        @param tokenAddress Address of ERC721 to transfer.
-        @param owner Address of current token owner.
-        @param tokenID ID of token to transfer.
-     */
-    function fundERC721(address tokenAddress, address owner, uint tokenID) public {
-        IERC721 erc721 = IERC721(tokenAddress);
-        erc721.transferFrom(owner, address(this), tokenID);
-    }
-
     /**
         @notice Used to gain custoday of deposited token.
         @param tokenAddress Address of ERC721 to transfer.

test/contractBridge/admin.js

@@ -174,9 +174,8 @@ contract('Bridge - [admin]', async accounts => {
         await ERC20MintableInstance.mint(tokenOwner, numTokens);
         ownerBalance = await ERC20MintableInstance.balanceOf(tokenOwner);
         assert.equal(ownerBalance, numTokens);
-            
-        await ERC20MintableInstance.approve(ERC20HandlerInstance.address, numTokens);
-        await ERC20HandlerInstance.fundERC20(ERC20MintableInstance.address, tokenOwner, numTokens);
+        
+        await ERC20MintableInstance.transfer(ERC20HandlerInstance.address, numTokens);
         ownerBalance = await ERC20MintableInstance.balanceOf(tokenOwner);
         assert.equal(ownerBalance, 0);
         handlerBalance = await ERC20MintableInstance.balanceOf(ERC20HandlerInstance.address);