Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add requirement to configureController(c,m) that m is not 0 #225

Merged
merged 1 commit into from
Oct 10, 2018
Merged

add requirement to configureController(c,m) that m is not 0 #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions contracts/minting/Controller.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,10 @@ contract Controller is Ownable {

/**
* @dev set the controller of a particular _worker
* To disable the controller, call configureController(_controller, address(0))
* Since a controller manages a single worker, assigning it address(0) is equivalent to
* removing _controller from the list of active controllers.
* Argument _worker must not be 0x00, call removeController(_controller) instead.
*/
function configureController(address _controller, address _worker) onlyOwner public returns (bool) {
require(_worker != address(0));
controllers[_controller] = _worker;
emit ControllerConfigured(_controller, _worker);
return true;
Expand Down
40 changes: 20 additions & 20 deletions verification/Spreadsheets/MINTp0 - ArgumentTests.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
File,Function,Arguments,Code,Description
Ownable.sol,transferOwnership,newOwner == msg.sender,arg000,arg000 transferOwnership(msg.sender) works
Ownable.sol,transferOwnership,newOwner == 0,arg001,arg001 transferOwnership(0) works
Ownable.sol,transferOwnership,newOwner == owner,arg002,arg002 transferOwnership(owner) works
Controller.sol,configureController,newController == 0,arg003,"arg003 configureController(0, M) works"
Controller.sol,configureController,newController == msg.sender,arg004,"arg004 configureController(msg.sender, M) works"
Controller.sol,configureController,newController == newMinter,arg005,"arg005 configureController(M, M) works"
Controller.sol,configureController,newMinter == 0,arg006,"arg006 configureController(C, 0) works"
Controller.sol,removeController,newController == 0,arg007,arg007 removeController(0) works
MintController.sol,setMinterManager,newMinterManager = 0,arg008,arg008 setMinterManager(0) works
MintController.sol,setMinterManager,newMinterManager == minterManager,arg009,arg009 setMinterManager(oldMinterManager) works
MintController.sol,setMinterManager,newMinterManager == user,arg010,arg010 setMinterManager(user_account) works
MintController.sol,setMinterManager,newMinterManager == newToken,arg011,arg011 setMinterManager(newToken) works
MintController.sol,configureMinter,newAllowance == 0,arg012,arg012 configureMinter(0) sets allowance to 0
MintController.sol,configureMinter,newAllowance == oldAllowance,arg013,arg013 configureMinter(oldAllowance) makes no changes
MintController.sol,configureMinter,newAllowance == 2^256-1,arg014,arg014 configureMinter(MAX) works
MintController.sol,incrementMinterAllowance,increment ==0,arg015,arg015 incrementMinterAllowance(0) makes no changes to allowance
MintController.sol,incrementMinterAllowance,increment == oldAllowance,arg016,arg016 incrementMinterAllowance(oldAllowance) doubles the allowance
MintController.sol,incrementMinterAllowance,increment == 2^256-1,arg017,arg017 incrementMinterAllowance(MAX) throws
MintController.sol,incrementMinterAllowance,increment + oldAllowance == 2^256 -1,arg018,arg018 incrementMinterAlllowance(BIG) throws
File,Function,Arguments,Code,Description
Ownable.sol,transferOwnership,newOwner == msg.sender,arg000,arg000 transferOwnership(msg.sender) works
Ownable.sol,transferOwnership,newOwner == 0,arg001,arg001 transferOwnership(0) works
Ownable.sol,transferOwnership,newOwner == owner,arg002,arg002 transferOwnership(owner) works
Controller.sol,configureController,newController == 0,arg003,"arg003 configureController(0, M) works"
Controller.sol,configureController,newController == msg.sender,arg004,"arg004 configureController(msg.sender, M) works"
Controller.sol,configureController,newController == newMinter,arg005,"arg005 configureController(M, M) works"
Controller.sol,configureController,newMinter == 0,arg006,"arg006 configureController(C, 0) throws"
Controller.sol,removeController,newController == 0,arg007,arg007 removeController(0) works
MintController.sol,setMinterManager,newMinterManager = 0,arg008,arg008 setMinterManager(0) works
MintController.sol,setMinterManager,newMinterManager == minterManager,arg009,arg009 setMinterManager(oldMinterManager) works
MintController.sol,setMinterManager,newMinterManager == user,arg010,arg010 setMinterManager(user_account) works
MintController.sol,setMinterManager,newMinterManager == newToken,arg011,arg011 setMinterManager(newToken) works
MintController.sol,configureMinter,newAllowance == 0,arg012,arg012 configureMinter(0) sets allowance to 0
MintController.sol,configureMinter,newAllowance == oldAllowance,arg013,arg013 configureMinter(oldAllowance) makes no changes
MintController.sol,configureMinter,newAllowance == 2^256-1,arg014,arg014 configureMinter(MAX) works
MintController.sol,incrementMinterAllowance,increment ==0,arg015,arg015 incrementMinterAllowance(0) makes no changes to allowance
MintController.sol,incrementMinterAllowance,increment == oldAllowance,arg016,arg016 incrementMinterAllowance(oldAllowance) doubles the allowance
MintController.sol,incrementMinterAllowance,increment == 2^256-1,arg017,arg017 incrementMinterAllowance(MAX) throws
MintController.sol,incrementMinterAllowance,increment + oldAllowance == 2^256 -1,arg018,arg018 incrementMinterAlllowance(BIG) throws