diff --git a/contracts/schemes/Auction4Reputation.sol b/contracts/schemes/Auction4Reputation.sol index 8f3e7d21..b0d64064 100644 --- a/contracts/schemes/Auction4Reputation.sol +++ b/contracts/schemes/Auction4Reputation.sol @@ -2,7 +2,6 @@ pragma solidity ^0.5.4; import "openzeppelin-solidity/contracts/math/SafeMath.sol"; import "../controller/ControllerInterface.sol"; -import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; import "../libs/SafeERC20.sol"; /** @@ -64,7 +63,6 @@ contract Auction4Reputation is Ownable { IERC20 _token, address _wallet) external - onlyOwner { require(avatar == Avatar(0), "can be called only one time"); require(_avatar != Avatar(0), "avatar cannot be zero"); @@ -116,7 +114,7 @@ contract Auction4Reputation is Ownable { function bid(uint256 _amount, uint256 _auctionId) public returns(uint256 auctionId) { require(_amount > 0, "bidding amount should be > 0"); // solhint-disable-next-line not-rely-on-time - require(now <= auctionsEndTime, "bidding should be within the allowed bidding period"); + require(now < auctionsEndTime, "bidding should be within the allowed bidding period"); // solhint-disable-next-line not-rely-on-time require(now >= auctionsStartTime, "bidding is enable only after bidding auctionsStartTime"); address(token).safeTransferFrom(msg.sender, address(this), _amount); diff --git a/contracts/schemes/ExternalLocking4Reputation.sol b/contracts/schemes/ExternalLocking4Reputation.sol index 77ea7ce9..20856919 100644 --- a/contracts/schemes/ExternalLocking4Reputation.sol +++ b/contracts/schemes/ExternalLocking4Reputation.sol @@ -1,8 +1,6 @@ pragma solidity ^0.5.4; import "./Locking4Reputation.sol"; -import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; - /** * @title A scheme for external locking Tokens for reputation @@ -43,7 +41,6 @@ contract ExternalLocking4Reputation is Locking4Reputation, Ownable { address _externalLockingContract, string calldata _getBalanceFuncSignature) external - onlyOwner { require(_claimingEndTime > _claimingStartTime, "_claimingEndTime should be greater than _claimingStartTime"); externalLockingContract = _externalLockingContract; diff --git a/contracts/schemes/LockingEth4Reputation.sol b/contracts/schemes/LockingEth4Reputation.sol index bdeaffa5..fa020082 100644 --- a/contracts/schemes/LockingEth4Reputation.sol +++ b/contracts/schemes/LockingEth4Reputation.sol @@ -1,14 +1,12 @@ pragma solidity ^0.5.4; import "./Locking4Reputation.sol"; -import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; - /** * @title A scheme for locking ETH for reputation */ -contract LockingEth4Reputation is Locking4Reputation, Ownable { +contract LockingEth4Reputation is Locking4Reputation { /** * @dev initialize @@ -30,7 +28,6 @@ contract LockingEth4Reputation is Locking4Reputation, Ownable { uint256 _redeemEnableTime, uint256 _maxLockingPeriod) external - onlyOwner { super._initialize( _avatar, diff --git a/contracts/schemes/LockingToken4Reputation.sol b/contracts/schemes/LockingToken4Reputation.sol index 04976ea0..9ceb8c30 100644 --- a/contracts/schemes/LockingToken4Reputation.sol +++ b/contracts/schemes/LockingToken4Reputation.sol @@ -2,7 +2,6 @@ pragma solidity ^0.5.4; import "./Locking4Reputation.sol"; import "./PriceOracleInterface.sol"; -import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; import "../libs/SafeERC20.sol"; @@ -10,7 +9,7 @@ import "../libs/SafeERC20.sol"; * @title A scheme for locking ERC20 Tokens for reputation */ -contract LockingToken4Reputation is Locking4Reputation, Ownable { +contract LockingToken4Reputation is Locking4Reputation { using SafeERC20 for address; PriceOracleInterface public priceOracleContract; @@ -42,7 +41,6 @@ contract LockingToken4Reputation is Locking4Reputation, Ownable { uint256 _maxLockingPeriod, PriceOracleInterface _priceOracleContract) external - onlyOwner { priceOracleContract = _priceOracleContract; super._initialize( diff --git a/contracts/universalSchemes/UniversalScheme.sol b/contracts/universalSchemes/UniversalScheme.sol index 85b4c051..ec04d9db 100644 --- a/contracts/universalSchemes/UniversalScheme.sol +++ b/contracts/universalSchemes/UniversalScheme.sol @@ -3,21 +3,9 @@ pragma solidity ^0.5.4; import "./UniversalSchemeInterface.sol"; import "../controller/ControllerInterface.sol"; import "../controller/Avatar.sol"; -import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; -contract UniversalScheme is Ownable, UniversalSchemeInterface { - bytes32 public hashedParameters; // For other parameters. - - function updateParameters( - bytes32 _hashedParameters - ) - public - onlyOwner - { - hashedParameters = _hashedParameters; - } - +contract UniversalScheme is UniversalSchemeInterface { /** * @dev get the parameters for the current scheme from the controller */ diff --git a/contracts/universalSchemes/UniversalSchemeInterface.sol b/contracts/universalSchemes/UniversalSchemeInterface.sol index 3f84c998..c37fbe87 100644 --- a/contracts/universalSchemes/UniversalSchemeInterface.sol +++ b/contracts/universalSchemes/UniversalSchemeInterface.sol @@ -4,7 +4,6 @@ import "../controller/Avatar.sol"; contract UniversalSchemeInterface { - function updateParameters(bytes32 _hashedParameters) public; - function getParametersFromController(Avatar _avatar) internal view returns(bytes32); + } diff --git a/test/auction4reputation.js b/test/auction4reputation.js index 71c86c55..4788697e 100644 --- a/test/auction4reputation.js +++ b/test/auction4reputation.js @@ -110,33 +110,6 @@ contract('Auction4Reputation', accounts => { } }); - it("initialize is onlyOwner", async () => { - var auction4Reputation = await Auction4Reputation.new(); - try { - await auction4Reputation.initialize(accounts[0], - 100, - 0, - 1000, - 1, - 1000, - accounts[0], - accounts[0], - {gas :constants.ARC_GAS_LIMIT,from:accounts[1]}); - assert(false, "initialize is onlyOwner"); - } catch(error) { - helpers.assertVMException(error); - } - await auction4Reputation.initialize(accounts[0], - 100, - 0, - 1000, - 1, - 1000, - accounts[0], - accounts[0], - {gas :constants.ARC_GAS_LIMIT,from:accounts[0]}); - }); - it("initialize auctionsEndTime = auctionsStartTime is not allowed", async () => { var auction4Reputation = await Auction4Reputation.new(); try { diff --git a/test/externallocking4reputation.js b/test/externallocking4reputation.js index 88670849..53254bcf 100644 --- a/test/externallocking4reputation.js +++ b/test/externallocking4reputation.js @@ -227,31 +227,6 @@ contract('ExternalLocking4Reputation', accounts => { } }); - it("initialize is onlyOwner", async () => { - var externalLocking4Reputation = await ExternalLocking4Reputation.new(); - try { - await externalLocking4Reputation.initialize(accounts[0], - 100, - 0, - 3000, - 3000, - accounts[0], - "lockedTokenBalances(address)", - {from:accounts[1]}); - assert(false, "initialize is onlyOwner"); - } catch(error) { - helpers.assertVMException(error); - } - await externalLocking4Reputation.initialize(accounts[0], - 100, - 0, - 3000, - 3000, - accounts[0], - "lockedTokenBalances(address)", - {from:accounts[0]}); - }); - it("redeemEnableTime >= lockingEndTime ", async () => { var externalLocking4Reputation = await ExternalLocking4Reputation.new(); try { diff --git a/test/lockingeth4reputation.js b/test/lockingeth4reputation.js index 76a86167..995f44b8 100644 --- a/test/lockingeth4reputation.js +++ b/test/lockingeth4reputation.js @@ -273,29 +273,6 @@ contract('LockingEth4Reputation', accounts => { } }); - it("initialize is onlyOwner", async () => { - var lockingEth4Reputation = await LockingEth4Reputation.new(); - try { - await lockingEth4Reputation.initialize(accounts[1], - 100, - 0, - 100, - 100, - 6000, - {from:accounts[1]}); - assert(false, "initialize is onlyOwner"); - } catch(error) { - helpers.assertVMException(error); - } - await lockingEth4Reputation.initialize(accounts[1], - 100, - 0, - 100, - 100, - 6000, - {from:accounts[0]}); - }); - it("redeemEnableTime >= lockingEndTime", async () => { var lockingEth4Reputation = await LockingEth4Reputation.new(); try { diff --git a/test/lockingtoken4reputation.js b/test/lockingtoken4reputation.js index 350e7989..df21bafd 100644 --- a/test/lockingtoken4reputation.js +++ b/test/lockingtoken4reputation.js @@ -298,31 +298,6 @@ contract('LockingToken4Reputation', accounts => { } }); - it("initialize is onlyOwner", async () => { - var lockingToken4Reputation = await LockingToken4Reputation.new(); - try { - await lockingToken4Reputation.initialize(accounts[1], - 100, - 0, - 100, - 100, - 6000, - accounts[1], - {from:accounts[1]}); - assert(false, "initialize is onlyOwner"); - } catch(error) { - helpers.assertVMException(error); - } - await lockingToken4Reputation.initialize(accounts[1], - 100, - 0, - 100, - 100, - 6000, - accounts[1], - {from:accounts[0]}); - }); - it("redeemEnableTime >= lockingEndTime", async () => { var lockingToken4Reputation = await LockingToken4Reputation.new(); try {