rearrange code

Author: d10r

packages/ethereum-contracts/contracts/utils/Only712MacroForwarder.sol

@@ -95,23 +95,6 @@ contract Only712MacroForwarder is ForwarderBase, EIP712, NonceManager {
 
     // PUBLIC FUNCTIONS
 
-    /**
-     * @dev Encode action and security params into the payload bytes expected by runMacro.
-     * @param actionParams params specific to the macro action, already ABI-encoded by the caller.
-     * @param security security related parameters
-     * @return Encoded payload to pass to runMacro()
-     */
-    function encodeParams(bytes calldata actionParams, SecurityType calldata security)
-        external pure
-        returns (bytes memory)
-    {
-        PrimaryType memory payload = PrimaryType({
-            action: ActionType({ actionParams: actionParams }),
-            security: security
-        });
-        return abi.encode(payload);
-    }
-
     /**
      * @dev Run the macro with encoded payload (generic + macro specific fragments).
      * @param m Target macro.
@@ -157,6 +140,23 @@ contract Only712MacroForwarder is ForwarderBase, EIP712, NonceManager {
         return retVal;
     }
 
+    /**
+     * @dev Encode action and security params into the payload bytes expected by runMacro.
+     * @param actionParams params specific to the macro action, already ABI-encoded by the caller.
+     * @param security security related parameters
+     * @return Encoded payload to pass to runMacro()
+     */
+    function encodeParams(bytes calldata actionParams, SecurityType calldata security)
+        external pure
+        returns (bytes memory)
+    {
+        PrimaryType memory payload = PrimaryType({
+            action: ActionType({ actionParams: actionParams }),
+            security: security
+        });
+        return abi.encode(payload);
+    }
+
     // TODO: should this exist?
     function getTypeDefinition(IUserDefined712Macro m, bytes calldata params) external view returns (string memory) {
         return _getTypeDefinition(m, params);