fix admin control && update proxy test framework

2020-11-25 17:08:28 +08:00
parent 8a4da4b525
commit 8da583d5a8
25 changed files with 383 additions and 177 deletions
--- a/contracts/DODOVendingMachine/impl/DVM.sol
+++ b/contracts/DODOVendingMachine/impl/DVM.sol
@@ -17,10 +17,6 @@ import {DVMFunding} from "./DVMFunding.sol";
 import {DVMVault} from "./DVMVault.sol";

 contract DVM is DVMTrader, DVMFunding {
-    constructor() public {
-        _FACTORY_ = msg.sender;
-    }
-
    function init(
        address owner,
        address maintainer,
@@ -33,7 +29,6 @@ contract DVM is DVMTrader, DVMFunding {
        uint256 i,
        uint256 k
    ) external {
-        require(msg.sender == _FACTORY_, 'INIT FORBIDDEN');
        initOwner(owner);
        _ADMIN_ = owner;
        _BASE_TOKEN_ = IERC20(baseTokenAddress);