Skip to content

Commit

Permalink
remove solmate
Browse files Browse the repository at this point in the history
we were only using the ERC20 implementation from it, and that could be
replaced by openzeppelin's
  • Loading branch information
plaintextpaco committed Mar 1, 2023
1 parent 9e5c4fb commit e7f0098
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 11 deletions.
6 changes: 3 additions & 3 deletions src/contracts/mocks/MockERC20.sol
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity ^0.8.17;

import {ERC20} from "solmate/src/tokens/ERC20.sol";
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import {CrucibleFactory} from "alchemist/contracts/crucible/CrucibleFactory.sol";

contract MockERC20 is ERC20 {
constructor(string memory name, string memory symbol)
ERC20(name, symbol, 18)
ERC20(name, symbol)
{}

function mint(address to, uint256 amount) public {
_mint(to, amount);
}
}
}
2 changes: 1 addition & 1 deletion src/test/AludelFactory.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// solhint-disable func-name-mixedcase
pragma solidity ^0.8.17;

import {ERC20} from "solmate/src/tokens/ERC20.sol";
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import {Vm} from "forge-std/Vm.sol";
import {Test} from "forge-std/Test.sol";
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/AludelFactoryIntegration.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity ^0.8.17;

import {Test} from "forge-std/Test.sol";
import {ERC20} from "solmate/src/tokens/ERC20.sol";
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import {Vm} from "forge-std/Vm.sol";
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/test/AludelV3.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity ^0.8.6;

import {Test} from "forge-std/Test.sol";
import {ERC20} from "solmate/src/tokens/ERC20.sol";
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import {Vm} from "forge-std/Vm.sol";
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/test/Utils.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity ^0.8.10;

import {ERC20} from "solmate/src/tokens/ERC20.sol";
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import {Vm} from "forge-std/Vm.sol";

import {AludelFactory} from "../contracts/AludelFactory.sol";
Expand Down
4 changes: 0 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6830,10 +6830,6 @@ [email protected]:
shelljs "^0.8.3"
web3-utils "^1.3.0"

"solmate@https://github.com/transmissions11/solmate#3998897acb502fa7b480f505138a6ae1842e8d10":
version "6.6.2"
resolved "https://github.com/transmissions11/solmate#3998897acb502fa7b480f505138a6ae1842e8d10"

source-map-support@^0.5.13:
version "0.5.21"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
Expand Down

0 comments on commit e7f0098

Please sign in to comment.