Test refactoring and explicit revert reasons (#45)

* Test refactoring and check emitted events Simplified and rewritten to use checked reverts Added functions for verifying events emitted by a transaction Cherry-picked from #25 Remove leading underscore in event params Additional event parameters Framework for event checking and TokenManager test impl Check AccessList constructor events using new system Linting Typo Explicit reasons and events for ExternalERC20Storage test remove TODO Linting Check events emitted from upgrade function Group whitelist/blacklist adding commands Use non-blacklisted account for blacklist test Simplify tests and remove rendundants * Check remaining revert reasons and add missing cases * Reinstate gas reporting * Use built-in node assert for code preconditions
etoroxlabs · Jan 7, 2019 · fd1c7aa · fd1c7aa
1 parent 883b47c
commit fd1c7aa
Show file tree

Hide file tree

Showing 13 changed files with 532 additions and 372 deletions.
diff --git a/contracts/TokenManager.sol b/contracts/TokenManager.sol
@@ -22,9 +22,9 @@ contract TokenManager is Ownable {
     mapping (bytes32 => TokenEntry) private tokens;
     bytes32[] private names;
 
-    event TokenAdded(bytes32 _name);
-    event TokenDeleted(bytes32 _name);
-    event TokenUpgraded(bytes32 _name);
+    event TokenAdded(bytes32 name, ITokenX addr);
+    event TokenDeleted(bytes32 name, ITokenX addr);
+    event TokenUpgraded(bytes32 name, ITokenX from, ITokenX to);
 
     /**
      * @dev Require that the token _name exists
@@ -70,7 +70,7 @@ contract TokenManager is Ownable {
             exists: true
         });
         names.push(_name);
-        emit TokenAdded(_name);
+        emit TokenAdded(_name, _iTokenX);
     }
 
     /**
@@ -82,10 +82,11 @@ contract TokenManager is Ownable {
         onlyOwner
         tokenExists(_name)
     {
+        ITokenX prev = tokens[_name].token;
         delete names[tokens[_name].index];
         delete tokens[_name].token;
         delete tokens[_name];
-        emit TokenDeleted(_name);
+        emit TokenDeleted(_name, prev);
     }
 
     /**
@@ -99,8 +100,9 @@ contract TokenManager is Ownable {
         tokenExists(_name)
         notNullToken(_iTokenX)
     {
+        ITokenX prev = tokens[_name].token;
         tokens[_name].token = _iTokenX;
-        emit TokenUpgraded(_name);
+        emit TokenUpgraded(_name, prev, _iTokenX);
     }
 
     /**

diff --git a/contracts/token/ERC20/ExternalERC20Storage.sol b/contracts/token/ERC20/ExternalERC20Storage.sol
@@ -93,7 +93,7 @@ contract ExternalERC20Storage is Ownable {
     onlyImplementorOrOwner
   {
     require(newImplementor != _implementor,
-            "Cannot transfer to same implementor as existsing");
+            "Cannot transfer to same implementor as existing");
     address curImplementor = _implementor;
     _implementor = newImplementor;
     emit StorageImplementorTransferred(curImplementor, newImplementor);

diff --git a/test/Accesslist.events.js b/test/Accesslist.events.js
@@ -0,0 +1,21 @@
+const utils = require('./utils.js');
+
+module.exports = utils.makeEventMap({
+  // TODO: Implement the constructor using an inheritance system
+  constructor: (addr) => [{ eventName: 'OwnershipTransferred',
+                           paramMap: { previousOwner: utils.ZERO_ADDRESS,
+                                       newOwner: addr } },
+                          { eventName: 'WhitelistAdminAdded',
+                           paramMap: { account: addr } },
+                          { eventName: 'BlacklistAdminAdded',
+                           paramMap: { account: addr } }
+                         ],
+  addWhitelisted: (addr) => [{ eventName: 'WhitelistAdded',
+                               paramMap: { account: addr } }],
+  removeWhitelisted: (addr) => [{ eventName: 'WhitelistRemoved',
+                                  paramMap: { account: addr } }],
+  addBlacklisted: (addr) => [{ eventName: 'BlacklistAdded',
+                               paramMap: { account: addr } }],
+  removeBlacklisted: (addr) => [{ eventName: 'BlacklistRemoved',
+                                  paramMap: { account: addr } }]
+});