Merge branch 'master'

This commit is contained in:
Hadrien Croubois
2021-01-26 18:58:15 +01:00
99 changed files with 2517 additions and 15875 deletions

View File

@ -2,7 +2,7 @@
pragma solidity ^0.7.0;
import "../GSN/Context.sol";
import "./Context.sol";
/**
* @dev Contract module which allows children to implement an emergency stop
@ -36,7 +36,7 @@ abstract contract Pausable is Context {
/**
* @dev Returns true if the contract is paused, and false otherwise.
*/
function paused() public view returns (bool) {
function paused() public view virtual returns (bool) {
return _paused;
}
@ -48,7 +48,7 @@ abstract contract Pausable is Context {
* - The contract must not be paused.
*/
modifier whenNotPaused() {
require(!_paused, "Pausable: paused");
require(!paused(), "Pausable: paused");
_;
}
@ -60,7 +60,7 @@ abstract contract Pausable is Context {
* - The contract must be paused.
*/
modifier whenPaused() {
require(_paused, "Pausable: not paused");
require(paused(), "Pausable: not paused");
_;
}