Merge pull request #180 from pgev/gh-179-callprefix-inconsistency

Execute rule and redemption callprefix-es are out of sync.
OpenST · Mar 25, 2019 · 4218158 · 4218158
2 parents e530238 + ecce6a7
commit 4218158
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/contracts/token/TokenHolder.sol b/contracts/token/TokenHolder.sol
@@ -93,13 +93,13 @@ contract TokenHolder is MasterCopyNonUpgradable
 
     bytes4 public constant EXECUTE_RULE_CALLPREFIX = bytes4(
         keccak256(
-            "executeRule(address,bytes,uint256,uint8,bytes32,bytes32)"
+            "executeRule(address,bytes,uint256,bytes32,bytes32,uint8)"
         )
     );
 
     bytes4 public constant EXECUTE_REDEMPTION_CALLPREFIX = bytes4(
         keccak256(
-            "executeRedemption(address,bytes,uint256,uint8,bytes32,bytes32)"
+            "executeRedemption(address,bytes,uint256,bytes32,bytes32,uint8)"
         )
     );
 

diff --git a/test/token_holder/execute_redemption.js b/test/token_holder/execute_redemption.js
@@ -45,13 +45,13 @@ function generateTokenHolderexecuteRedemptionFunctionCallPrefix() {
         type: 'uint256', name: '',
       },
       {
-        type: 'uint8', name: '',
+        type: 'bytes32', name: '',
       },
       {
         type: 'bytes32', name: '',
       },
       {
-        type: 'bytes32', name: '',
+        type: 'uint8', name: '',
       },
     ],
   });

diff --git a/test/token_holder/execute_rule.js b/test/token_holder/execute_rule.js
@@ -139,13 +139,13 @@ function generateTokenHolderExecuteRuleCallPrefix() {
         type: 'uint256', name: '',
       },
       {
-        type: 'uint8', name: '',
+        type: 'bytes32', name: '',
       },
       {
         type: 'bytes32', name: '',
       },
       {
-        type: 'bytes32', name: '',
+        type: 'uint8', name: '',
       },
     ],
   });