Skip to content

Commit

Permalink
fix:broken tests
Browse files Browse the repository at this point in the history
  • Loading branch information
hashedMae committed Jan 25, 2023
1 parent 9093296 commit e46b26c
Show file tree
Hide file tree
Showing 14 changed files with 355 additions and 255 deletions.
26 changes: 12 additions & 14 deletions packages/contracts/src/dollar/ERC20Ubiquity.sol
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,11 @@ contract ERC20Ubiquity is IERC20Ubiquity, ERC20, ERC20Burnable, ERC20Pausable {
_;
}

constructor(address _manager, string memory name_, string memory symbol_)
ERC20(name_, symbol_)
{
constructor(
UbiquityDollarManager _manager,
string memory name_,
string memory symbol_
) ERC20(name_, symbol_) {
_tokenName = name_;
_symbol = symbol_;
manager = _manager;
Expand Down Expand Up @@ -147,11 +149,9 @@ contract ERC20Ubiquity is IERC20Ubiquity, ERC20, ERC20Burnable, ERC20Pausable {

/// @notice burn Ubiquity Dollar tokens from caller
/// @param amount the amount to burn
function burn(uint256 amount)
public
override (ERC20Burnable, IERC20Ubiquity)
whenNotPaused
{
function burn(
uint256 amount
) public override(ERC20Burnable, IERC20Ubiquity) whenNotPaused {
super.burn(amount);
emit Burning(msg.sender, amount);
}
Expand All @@ -173,12 +173,10 @@ contract ERC20Ubiquity is IERC20Ubiquity, ERC20, ERC20Burnable, ERC20Pausable {
}

// @dev Creates `amount` new tokens for `to`.
function mint(address to, uint256 amount)
public
override
onlyMinter
whenNotPaused
{
function mint(
address to,
uint256 amount
) public override onlyMinter whenNotPaused {
_mint(to, amount);
emit Minting(to, msg.sender, amount);
}
Expand Down
Loading

0 comments on commit e46b26c

Please sign in to comment.