Use TransactionInvalidContextError in _assertExecutableTransaction

2019-08-22 15:47:25 -07:00
parent 44753bb168
commit edb923b8bb
1 changed files with 6 additions and 5 deletions
--- a/contracts/exchange/contracts/src/MixinTransactions.sol
+++ b/contracts/exchange/contracts/src/MixinTransactions.sol
@@ -150,11 +150,12 @@ contract MixinTransactions is
            ));
        }

-        // Prevent reentrancy
-        if (currentContextAddress != address(0)) {
-            LibRichErrors.rrevert(LibExchangeRichErrors.TransactionError(
-                LibExchangeRichErrors.TransactionErrorCodes.NO_REENTRANCY,
-                transactionHash
+        // Prevent `executeTransaction` from being called when context is already set
+        address currentContextAddress_ = currentContextAddress;
+        if (currentContextAddress_ != address(0)) {
+            LibRichErrors.rrevert(LibExchangeRichErrors.TransactionInvalidContextError(
+                transactionHash,
+                currentContextAddress_
            ));
        }