From 4e9d5be742d1fb128fe4ce1476c2f77a4533ec66 Mon Sep 17 00:00:00 2001
From: Erik Dubovyk <erik.dubovyk@cyber-bee.co.uk>
Date: Wed, 31 Jul 2024 18:50:31 +0300
Subject: [PATCH] Excluded redefinition of transfer structures.

---
 test/abstract/FlowUtilsAbstractTest.sol | 26 +++----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/test/abstract/FlowUtilsAbstractTest.sol b/test/abstract/FlowUtilsAbstractTest.sol
index 206522ba..771df4ff 100644
--- a/test/abstract/FlowUtilsAbstractTest.sol
+++ b/test/abstract/FlowUtilsAbstractTest.sol
@@ -2,28 +2,8 @@
 pragma solidity ^0.8.18;
 
 import {Test, Vm} from "forge-std/Test.sol";
-
-struct ERC1155Transfer {
-    address token;
-    address from;
-    address to;
-    uint256 id;
-    uint256 amount;
-}
-
-struct ERC721Transfer {
-    address token;
-    address from;
-    address to;
-    uint256 id;
-}
-
-struct ERC20Transfer {
-    address token;
-    address from;
-    address to;
-    uint256 amount;
-}
+import {ERC20Transfer, ERC721Transfer, ERC1155Transfer, RAIN_FLOW_SENTINEL} from "src/interface/unstable/IFlowV5.sol";
+import {Sentinel} from "rain.solmem/lib/LibStackSentinel.sol";
 
 abstract contract FlowUtilsAbstractTest is Test {
     function generateTokenTransferStack(
@@ -36,7 +16,7 @@ abstract contract FlowUtilsAbstractTest is Test {
         stack = new uint256[](totalItems);
         uint256 index = 0;
 
-        uint256 separator = 115183058774379759847873638693462432260838474092724525396123647190314935293775;
+        uint256 separator = Sentinel.unwrap(RAIN_FLOW_SENTINEL);
 
         stack[index++] = separator;
         for (uint256 i = 0; i < erc1155Transfers.length; i++) {