diff --git a/test/src/error/ErrTruncate.t.sol b/test/src/error/ErrTruncate.t.sol index 0897e88..5a2c573 100644 --- a/test/src/error/ErrTruncate.t.sol +++ b/test/src/error/ErrTruncate.t.sol @@ -3,10 +3,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {OutOfBoundsTruncate} from "src/error/ErrTruncate.sol"; -import {LibBytes} from "src/lib/LibBytes.sol"; -import {LibBytes32Array} from "src/lib/LibBytes32Array.sol"; -import {LibUint256Array} from "src/lib/LibUint256Array.sol"; +import {OutOfBoundsTruncate} from "../../../src/error/ErrTruncate.sol"; +import {LibBytes} from "../../../src/lib/LibBytes.sol"; +import {LibBytes32Array} from "../../../src/lib/LibBytes32Array.sol"; +import {LibUint256Array} from "../../../src/lib/LibUint256Array.sol"; contract ErrTruncateTest is Test { function truncateBytesExternal(uint256 length, uint256 truncatedLength) external pure { diff --git a/test/src/lib/LibArray.aliasedTail.t.sol b/test/src/lib/LibArray.aliasedTail.t.sol index 6615cf9..aa6ab75 100644 --- a/test/src/lib/LibArray.aliasedTail.t.sol +++ b/test/src/lib/LibArray.aliasedTail.t.sol @@ -3,8 +3,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Array} from "src/lib/LibUint256Array.sol"; -import {LibBytes32Array} from "src/lib/LibBytes32Array.sol"; +import {LibUint256Array} from "../../../src/lib/LibUint256Array.sol"; +import {LibBytes32Array} from "../../../src/lib/LibBytes32Array.sol"; /// The tail taking `arrayFrom` overloads allocate their output at the free /// memory pointer and read the tail's length word to size the copy. A tail that diff --git a/test/src/lib/LibArray.selfExtend.t.sol b/test/src/lib/LibArray.selfExtend.t.sol index 7beac3d..c76106a 100644 --- a/test/src/lib/LibArray.selfExtend.t.sol +++ b/test/src/lib/LibArray.selfExtend.t.sol @@ -3,8 +3,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Array} from "src/lib/LibUint256Array.sol"; -import {LibBytes32Array} from "src/lib/LibBytes32Array.sol"; +import {LibUint256Array} from "../../../src/lib/LibUint256Array.sol"; +import {LibBytes32Array} from "../../../src/lib/LibBytes32Array.sol"; /// Extending an array by itself. Base and extend are then ONE array, so the in /// place path would rewrite the length word both of them read through, mutating diff --git a/test/src/lib/LibArraySlow.copySlow.t.sol b/test/src/lib/LibArraySlow.copySlow.t.sol index e47f6d7..6070dbb 100644 --- a/test/src/lib/LibArraySlow.copySlow.t.sol +++ b/test/src/lib/LibArraySlow.copySlow.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256ArraySlow} from "test/lib/LibUint256ArraySlow.sol"; -import {LibBytes32ArraySlow} from "test/lib/LibBytes32ArraySlow.sol"; +import {LibUint256ArraySlow} from "../../lib/LibUint256ArraySlow.sol"; +import {LibBytes32ArraySlow} from "../../lib/LibBytes32ArraySlow.sol"; /// `copySlow` snapshots an input before it is handed to an implementation under /// test, so the differential tests can build their expected values from memory diff --git a/test/src/lib/LibBytes.t.sol b/test/src/lib/LibBytes.t.sol index 9231bf9..2be474f 100644 --- a/test/src/lib/LibBytes.t.sol +++ b/test/src/lib/LibBytes.t.sol @@ -3,9 +3,9 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes} from "src/lib/LibBytes.sol"; -import {OutOfBoundsTruncate} from "src/error/ErrTruncate.sol"; -import {LibPointer, Pointer, LibMemCpy} from "src/lib/LibMemCpy.sol"; +import {LibBytes} from "../../../src/lib/LibBytes.sol"; +import {OutOfBoundsTruncate} from "../../../src/error/ErrTruncate.sol"; +import {LibPointer, Pointer, LibMemCpy} from "../../../src/lib/LibMemCpy.sol"; contract LibBytesTest is Test { using LibBytes for bytes; diff --git a/test/src/lib/LibBytes32Array.allocation.t.sol b/test/src/lib/LibBytes32Array.allocation.t.sol index 1d173fd..a87d69b 100644 --- a/test/src/lib/LibBytes32Array.allocation.t.sol +++ b/test/src/lib/LibBytes32Array.allocation.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes32Array, Pointer} from "src/lib/LibBytes32Array.sol"; -import {LibPointer} from "src/lib/LibPointer.sol"; +import {LibBytes32Array, Pointer} from "../../../src/lib/LibBytes32Array.sol"; +import {LibPointer} from "../../../src/lib/LibPointer.sol"; /// The existing `unsafeExtend` tests assert the CONTENTS of the extended array /// against a reference implementation. Contents alone cannot see the allocator diff --git a/test/src/lib/LibBytes32Array.arrayFrom.t.sol b/test/src/lib/LibBytes32Array.arrayFrom.t.sol index da17b07..eb19cd5 100644 --- a/test/src/lib/LibBytes32Array.arrayFrom.t.sol +++ b/test/src/lib/LibBytes32Array.arrayFrom.t.sol @@ -4,10 +4,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes32Array, Pointer} from "src/lib/LibBytes32Array.sol"; -import {LibPointer} from "src/lib/LibPointer.sol"; +import {LibBytes32Array, Pointer} from "../../../src/lib/LibBytes32Array.sol"; +import {LibPointer} from "../../../src/lib/LibPointer.sol"; -import {LibBytes32ArraySlow} from "test/lib/LibBytes32ArraySlow.sol"; +import {LibBytes32ArraySlow} from "../../lib/LibBytes32ArraySlow.sol"; contract LibBytes32ArrayArrayFromTest is Test { using LibBytes32Array for bytes32; diff --git a/test/src/lib/LibBytes32Array.extend.t.sol b/test/src/lib/LibBytes32Array.extend.t.sol index 4fc27a8..4394730 100644 --- a/test/src/lib/LibBytes32Array.extend.t.sol +++ b/test/src/lib/LibBytes32Array.extend.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes32Array, Pointer} from "src/lib/LibBytes32Array.sol"; -import {LibBytes32ArraySlow} from "test/lib/LibBytes32ArraySlow.sol"; +import {LibBytes32Array, Pointer} from "../../../src/lib/LibBytes32Array.sol"; +import {LibBytes32ArraySlow} from "../../lib/LibBytes32ArraySlow.sol"; contract LibBytes32ArrayExtendTest is Test { // This code path hits the inline extension by ensuring that c is the most diff --git a/test/src/lib/LibBytes32Array.pointer.t.sol b/test/src/lib/LibBytes32Array.pointer.t.sol index f60d764..8dc7fa8 100644 --- a/test/src/lib/LibBytes32Array.pointer.t.sol +++ b/test/src/lib/LibBytes32Array.pointer.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes32Array, Pointer} from "src/lib/LibBytes32Array.sol"; +import {LibBytes32Array, Pointer} from "../../../src/lib/LibBytes32Array.sol"; contract LibBytes32ArrayPointerTest is Test { using LibBytes32Array for bytes32[]; diff --git a/test/src/lib/LibBytes32Array.reverse.t.sol b/test/src/lib/LibBytes32Array.reverse.t.sol index c50818b..b6a4b6a 100644 --- a/test/src/lib/LibBytes32Array.reverse.t.sol +++ b/test/src/lib/LibBytes32Array.reverse.t.sol @@ -3,9 +3,9 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes32Array, Pointer} from "src/lib/LibBytes32Array.sol"; -import {LibPointer} from "src/lib/LibPointer.sol"; -import {LibBytes32ArraySlow} from "test/lib/LibBytes32ArraySlow.sol"; +import {LibBytes32Array, Pointer} from "../../../src/lib/LibBytes32Array.sol"; +import {LibPointer} from "../../../src/lib/LibPointer.sol"; +import {LibBytes32ArraySlow} from "../../lib/LibBytes32ArraySlow.sol"; contract LibBytes32ArrayReverseTest is Test { /// Test that the reverse function works as expected according to the diff --git a/test/src/lib/LibBytes32Array.truncate.t.sol b/test/src/lib/LibBytes32Array.truncate.t.sol index fe402c2..317feac 100644 --- a/test/src/lib/LibBytes32Array.truncate.t.sol +++ b/test/src/lib/LibBytes32Array.truncate.t.sol @@ -3,10 +3,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes32Array, Pointer} from "src/lib/LibBytes32Array.sol"; -import {LibPointer} from "src/lib/LibPointer.sol"; -import {OutOfBoundsTruncate} from "src/error/ErrTruncate.sol"; -import {LibBytes32ArraySlow} from "test/lib/LibBytes32ArraySlow.sol"; +import {LibBytes32Array, Pointer} from "../../../src/lib/LibBytes32Array.sol"; +import {LibPointer} from "../../../src/lib/LibPointer.sol"; +import {OutOfBoundsTruncate} from "../../../src/error/ErrTruncate.sol"; +import {LibBytes32ArraySlow} from "../../lib/LibBytes32ArraySlow.sol"; contract LibBytes32ArrayTruncateTest is Test { function truncateExternal(bytes32[] memory a, uint256 newLength) external pure returns (bytes32[] memory) { diff --git a/test/src/lib/LibBytes32Matrix.allocation.t.sol b/test/src/lib/LibBytes32Matrix.allocation.t.sol index e3335bb..6bbba9c 100644 --- a/test/src/lib/LibBytes32Matrix.allocation.t.sol +++ b/test/src/lib/LibBytes32Matrix.allocation.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes32Array} from "src/lib/LibBytes32Array.sol"; -import {LibBytes32Matrix, LibPointer, Pointer} from "src/lib/LibBytes32Matrix.sol"; +import {LibBytes32Array} from "../../../src/lib/LibBytes32Array.sol"; +import {LibBytes32Matrix, LibPointer, Pointer} from "../../../src/lib/LibBytes32Matrix.sol"; /// The existing `flatten` tests assert the CONTENTS of the flattened array. /// `flatten` also performs an allocation, and an over-allocating `flatten` diff --git a/test/src/lib/LibBytes32Matrix.endPointer.t.sol b/test/src/lib/LibBytes32Matrix.endPointer.t.sol index dcbdfe9..e775203 100644 --- a/test/src/lib/LibBytes32Matrix.endPointer.t.sol +++ b/test/src/lib/LibBytes32Matrix.endPointer.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes32Array} from "src/lib/LibBytes32Array.sol"; -import {LibBytes32Matrix, LibPointer, Pointer} from "src/lib/LibBytes32Matrix.sol"; +import {LibBytes32Array} from "../../../src/lib/LibBytes32Array.sol"; +import {LibBytes32Matrix, LibPointer, Pointer} from "../../../src/lib/LibBytes32Matrix.sol"; /// `endPointer` on a matrix is one word past the last REFERENCE, which is not /// the end of any allocation. The NatSpec on `endPointer` states where the inner diff --git a/test/src/lib/LibBytes32Matrix.flatten.t.sol b/test/src/lib/LibBytes32Matrix.flatten.t.sol index 74fe5f4..1170848 100644 --- a/test/src/lib/LibBytes32Matrix.flatten.t.sol +++ b/test/src/lib/LibBytes32Matrix.flatten.t.sol @@ -3,10 +3,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes32Array} from "src/lib/LibBytes32Array.sol"; -import {LibBytes32Matrix} from "src/lib/LibBytes32Matrix.sol"; -import {LibPointer, Pointer} from "src/lib/LibPointer.sol"; -import {LibBytes32MatrixSlow} from "test/lib/LibBytes32MatrixSlow.sol"; +import {LibBytes32Array} from "../../../src/lib/LibBytes32Array.sol"; +import {LibBytes32Matrix} from "../../../src/lib/LibBytes32Matrix.sol"; +import {LibPointer, Pointer} from "../../../src/lib/LibPointer.sol"; +import {LibBytes32MatrixSlow} from "../../lib/LibBytes32MatrixSlow.sol"; contract LibBytes32MatrixFlattenTest is Test { using LibBytes32Array for bytes32[]; diff --git a/test/src/lib/LibBytes32Matrix.itemCount.t.sol b/test/src/lib/LibBytes32Matrix.itemCount.t.sol index 83bf898..7c639f4 100644 --- a/test/src/lib/LibBytes32Matrix.itemCount.t.sol +++ b/test/src/lib/LibBytes32Matrix.itemCount.t.sol @@ -3,10 +3,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes32Matrix} from "src/lib/LibBytes32Matrix.sol"; -import {LibBytes32Array} from "src/lib/LibBytes32Array.sol"; -import {LibPointer, Pointer} from "src/lib/LibPointer.sol"; -import {LibBytes32MatrixSlow} from "test/lib/LibBytes32MatrixSlow.sol"; +import {LibBytes32Matrix} from "../../../src/lib/LibBytes32Matrix.sol"; +import {LibBytes32Array} from "../../../src/lib/LibBytes32Array.sol"; +import {LibPointer, Pointer} from "../../../src/lib/LibPointer.sol"; +import {LibBytes32MatrixSlow} from "../../lib/LibBytes32MatrixSlow.sol"; contract LibBytes32MatrixItemCountTest is Test { using LibBytes32Matrix for bytes32[][]; diff --git a/test/src/lib/LibBytes32Matrix.matrixFrom.t.sol b/test/src/lib/LibBytes32Matrix.matrixFrom.t.sol index 5bf20e1..96f5369 100644 --- a/test/src/lib/LibBytes32Matrix.matrixFrom.t.sol +++ b/test/src/lib/LibBytes32Matrix.matrixFrom.t.sol @@ -3,10 +3,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes32Array} from "src/lib/LibBytes32Array.sol"; -import {LibBytes32Matrix, LibPointer, Pointer} from "src/lib/LibBytes32Matrix.sol"; +import {LibBytes32Array} from "../../../src/lib/LibBytes32Array.sol"; +import {LibBytes32Matrix, LibPointer, Pointer} from "../../../src/lib/LibBytes32Matrix.sol"; -import {LibBytes32MatrixSlow} from "test/lib/LibBytes32MatrixSlow.sol"; +import {LibBytes32MatrixSlow} from "../../lib/LibBytes32MatrixSlow.sol"; contract LibBytes32MatrixMatrixFromTest is Test { using LibBytes32Array for bytes32; diff --git a/test/src/lib/LibBytes32Matrix.pointer.t.sol b/test/src/lib/LibBytes32Matrix.pointer.t.sol index b0af38a..1a63a26 100644 --- a/test/src/lib/LibBytes32Matrix.pointer.t.sol +++ b/test/src/lib/LibBytes32Matrix.pointer.t.sol @@ -3,9 +3,9 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibBytes32Matrix, Pointer} from "src/lib/LibBytes32Matrix.sol"; +import {LibBytes32Matrix, Pointer} from "../../../src/lib/LibBytes32Matrix.sol"; -import {LibBytes32MatrixSlow} from "test/lib/LibBytes32MatrixSlow.sol"; +import {LibBytes32MatrixSlow} from "../../lib/LibBytes32MatrixSlow.sol"; contract LibBytes32MatrixPointerTest is Test { using LibBytes32Matrix for bytes32[][]; diff --git a/test/src/lib/LibMatrix.flattenWrap.t.sol b/test/src/lib/LibMatrix.flattenWrap.t.sol index 0e1b0b9..87f2759 100644 --- a/test/src/lib/LibMatrix.flattenWrap.t.sol +++ b/test/src/lib/LibMatrix.flattenWrap.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {Test, stdError} from "forge-std-1.16.2/src/Test.sol"; -import {LibMatrixFlattenWrapHarness} from "test/src/lib/LibMatrixFlattenWrapHarness.sol"; +import {LibMatrixFlattenWrapHarness} from "./LibMatrixFlattenWrapHarness.sol"; /// Reproduces issue #62 for `LibUint256Matrix` and its byte identical /// `LibBytes32Matrix` twin. diff --git a/test/src/lib/LibMatrixFlattenWrapHarness.sol b/test/src/lib/LibMatrixFlattenWrapHarness.sol index 4483419..5466a76 100644 --- a/test/src/lib/LibMatrixFlattenWrapHarness.sol +++ b/test/src/lib/LibMatrixFlattenWrapHarness.sol @@ -2,8 +2,8 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {LibUint256Matrix} from "src/lib/LibUint256Matrix.sol"; -import {LibBytes32Matrix} from "src/lib/LibBytes32Matrix.sol"; +import {LibUint256Matrix} from "../../../src/lib/LibUint256Matrix.sol"; +import {LibBytes32Matrix} from "../../../src/lib/LibBytes32Matrix.sol"; /// Harness for `itemCount` and `flatten` on both matrix libraries. /// diff --git a/test/src/lib/LibMemCpy.Bytes.t.sol b/test/src/lib/LibMemCpy.Bytes.t.sol index 4589be9..9734017 100644 --- a/test/src/lib/LibMemCpy.Bytes.t.sol +++ b/test/src/lib/LibMemCpy.Bytes.t.sol @@ -4,9 +4,9 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibMemCpy} from "src/lib/LibMemCpy.sol"; -import {Pointer, LibBytes} from "src/lib/LibBytes.sol"; -import {LibPointer} from "src/lib/LibPointer.sol"; +import {LibMemCpy} from "../../../src/lib/LibMemCpy.sol"; +import {Pointer, LibBytes} from "../../../src/lib/LibBytes.sol"; +import {LibPointer} from "../../../src/lib/LibPointer.sol"; contract LibMemCpyBytesTest is Test { using LibPointer for Pointer; diff --git a/test/src/lib/LibMemCpy.Words.t.sol b/test/src/lib/LibMemCpy.Words.t.sol index 2546545..2ec1819 100644 --- a/test/src/lib/LibMemCpy.Words.t.sol +++ b/test/src/lib/LibMemCpy.Words.t.sol @@ -4,9 +4,9 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibMemCpy} from "src/lib/LibMemCpy.sol"; -import {LibUint256Array, Pointer} from "src/lib/LibUint256Array.sol"; -import {LibPointer} from "src/lib/LibPointer.sol"; +import {LibMemCpy} from "../../../src/lib/LibMemCpy.sol"; +import {LibUint256Array, Pointer} from "../../../src/lib/LibUint256Array.sol"; +import {LibPointer} from "../../../src/lib/LibPointer.sol"; contract LibMemCpyWordsTest is Test { using LibPointer for Pointer; diff --git a/test/src/lib/LibPointer.t.sol b/test/src/lib/LibPointer.t.sol index 7731bcc..4536eab 100644 --- a/test/src/lib/LibPointer.t.sol +++ b/test/src/lib/LibPointer.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibPointer, Pointer} from "src/lib/LibPointer.sol"; -import {LibBytes} from "src/lib/LibBytes.sol"; +import {LibPointer, Pointer} from "../../../src/lib/LibPointer.sol"; +import {LibBytes} from "../../../src/lib/LibBytes.sol"; contract LibPointerTest is Test { using LibPointer for Pointer; diff --git a/test/src/lib/LibStackSentinel.t.sol b/test/src/lib/LibStackSentinel.t.sol index 8c50fe8..601e25e 100644 --- a/test/src/lib/LibStackSentinel.t.sol +++ b/test/src/lib/LibStackSentinel.t.sol @@ -4,16 +4,16 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibPointer, Pointer} from "src/lib/LibPointer.sol"; -import {LibUint256Array} from "src/lib/LibUint256Array.sol"; -import {UnalignedStackPointer} from "src/error/ErrStackPointer.sol"; +import {LibPointer, Pointer} from "../../../src/lib/LibPointer.sol"; +import {LibUint256Array} from "../../../src/lib/LibUint256Array.sol"; +import {UnalignedStackPointer} from "../../../src/error/ErrStackPointer.sol"; import { InvalidStackBounds, MissingSentinel, UnallocatedStack, ZeroSentinelTupleSize -} from "src/error/ErrStackSentinel.sol"; -import {LibStackSentinel, Sentinel} from "src/lib/LibStackSentinel.sol"; +} from "../../../src/error/ErrStackSentinel.sol"; +import {LibStackSentinel, Sentinel} from "../../../src/lib/LibStackSentinel.sol"; contract LibStackSentinelTest is Test { using LibUint256Array for uint256[]; diff --git a/test/src/lib/LibStackSentinel.tupleSizeWrap.t.sol b/test/src/lib/LibStackSentinel.tupleSizeWrap.t.sol index 6dd5999..208409a 100644 --- a/test/src/lib/LibStackSentinel.tupleSizeWrap.t.sol +++ b/test/src/lib/LibStackSentinel.tupleSizeWrap.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibStackSentinelWrapHarness} from "test/src/lib/LibStackSentinelWrapHarness.sol"; +import {LibStackSentinelWrapHarness} from "./LibStackSentinelWrapHarness.sol"; /// Reproduces the `consumeSentinelTuples` half of issue #54. /// diff --git a/test/src/lib/LibStackSentinelWrapHarness.sol b/test/src/lib/LibStackSentinelWrapHarness.sol index b825e09..5a6ba60 100644 --- a/test/src/lib/LibStackSentinelWrapHarness.sol +++ b/test/src/lib/LibStackSentinelWrapHarness.sol @@ -2,9 +2,9 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {LibStackSentinel, Sentinel} from "src/lib/LibStackSentinel.sol"; -import {LibUint256Array} from "src/lib/LibUint256Array.sol"; -import {Pointer} from "src/lib/LibPointer.sol"; +import {LibStackSentinel, Sentinel} from "../../../src/lib/LibStackSentinel.sol"; +import {LibUint256Array} from "../../../src/lib/LibUint256Array.sol"; +import {Pointer} from "../../../src/lib/LibPointer.sol"; /// Harness for `LibStackSentinel.consumeSentinelTuples`. /// diff --git a/test/src/lib/LibUint256Array.allocation.t.sol b/test/src/lib/LibUint256Array.allocation.t.sol index 9e65627..1e81c7d 100644 --- a/test/src/lib/LibUint256Array.allocation.t.sol +++ b/test/src/lib/LibUint256Array.allocation.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Array, Pointer} from "src/lib/LibUint256Array.sol"; -import {LibPointer} from "src/lib/LibPointer.sol"; +import {LibUint256Array, Pointer} from "../../../src/lib/LibUint256Array.sol"; +import {LibPointer} from "../../../src/lib/LibPointer.sol"; /// The existing `unsafeExtend` tests assert the CONTENTS of the extended array /// against a reference implementation. Contents alone cannot see the allocator diff --git a/test/src/lib/LibUint256Array.arrayFrom.t.sol b/test/src/lib/LibUint256Array.arrayFrom.t.sol index 6703094..10ab3c3 100644 --- a/test/src/lib/LibUint256Array.arrayFrom.t.sol +++ b/test/src/lib/LibUint256Array.arrayFrom.t.sol @@ -4,10 +4,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Array, Pointer} from "src/lib/LibUint256Array.sol"; -import {LibPointer} from "src/lib/LibPointer.sol"; +import {LibUint256Array, Pointer} from "../../../src/lib/LibUint256Array.sol"; +import {LibPointer} from "../../../src/lib/LibPointer.sol"; -import {LibUint256ArraySlow} from "test/lib/LibUint256ArraySlow.sol"; +import {LibUint256ArraySlow} from "../../lib/LibUint256ArraySlow.sol"; contract LibUint256ArrayArrayFromTest is Test { using LibUint256Array for uint256; diff --git a/test/src/lib/LibUint256Array.extend.t.sol b/test/src/lib/LibUint256Array.extend.t.sol index 96e9aef..eeaa30c 100644 --- a/test/src/lib/LibUint256Array.extend.t.sol +++ b/test/src/lib/LibUint256Array.extend.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Array, Pointer} from "src/lib/LibUint256Array.sol"; -import {LibUint256ArraySlow} from "test/lib/LibUint256ArraySlow.sol"; +import {LibUint256Array, Pointer} from "../../../src/lib/LibUint256Array.sol"; +import {LibUint256ArraySlow} from "../../lib/LibUint256ArraySlow.sol"; contract LibUint256ArrayExtendTest is Test { // This code path hits the inline extension by ensuring that c is the most diff --git a/test/src/lib/LibUint256Array.pointer.t.sol b/test/src/lib/LibUint256Array.pointer.t.sol index 4e34586..98ac265 100644 --- a/test/src/lib/LibUint256Array.pointer.t.sol +++ b/test/src/lib/LibUint256Array.pointer.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Array, Pointer} from "src/lib/LibUint256Array.sol"; +import {LibUint256Array, Pointer} from "../../../src/lib/LibUint256Array.sol"; contract LibUint256ArrayPointerTest is Test { using LibUint256Array for uint256[]; diff --git a/test/src/lib/LibUint256Array.reverse.t.sol b/test/src/lib/LibUint256Array.reverse.t.sol index 15ec572..3fe19f3 100644 --- a/test/src/lib/LibUint256Array.reverse.t.sol +++ b/test/src/lib/LibUint256Array.reverse.t.sol @@ -3,9 +3,9 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Array, Pointer} from "src/lib/LibUint256Array.sol"; -import {LibPointer} from "src/lib/LibPointer.sol"; -import {LibUint256ArraySlow} from "test/lib/LibUint256ArraySlow.sol"; +import {LibUint256Array, Pointer} from "../../../src/lib/LibUint256Array.sol"; +import {LibPointer} from "../../../src/lib/LibPointer.sol"; +import {LibUint256ArraySlow} from "../../lib/LibUint256ArraySlow.sol"; contract LibUint256ArrayReverseTest is Test { /// Test that the reverse function works as expected according to the diff --git a/test/src/lib/LibUint256Array.truncate.t.sol b/test/src/lib/LibUint256Array.truncate.t.sol index 3ea27a4..045a50c 100644 --- a/test/src/lib/LibUint256Array.truncate.t.sol +++ b/test/src/lib/LibUint256Array.truncate.t.sol @@ -3,10 +3,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Array, Pointer} from "src/lib/LibUint256Array.sol"; -import {LibPointer} from "src/lib/LibPointer.sol"; -import {OutOfBoundsTruncate} from "src/error/ErrTruncate.sol"; -import {LibUint256ArraySlow} from "test/lib/LibUint256ArraySlow.sol"; +import {LibUint256Array, Pointer} from "../../../src/lib/LibUint256Array.sol"; +import {LibPointer} from "../../../src/lib/LibPointer.sol"; +import {OutOfBoundsTruncate} from "../../../src/error/ErrTruncate.sol"; +import {LibUint256ArraySlow} from "../../lib/LibUint256ArraySlow.sol"; contract LibUint256ArrayTruncateTest is Test { function truncateExternal(uint256[] memory a, uint256 newLength) external pure returns (uint256[] memory) { diff --git a/test/src/lib/LibUint256Matrix.allocation.t.sol b/test/src/lib/LibUint256Matrix.allocation.t.sol index cc83218..a44df26 100644 --- a/test/src/lib/LibUint256Matrix.allocation.t.sol +++ b/test/src/lib/LibUint256Matrix.allocation.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Array} from "src/lib/LibUint256Array.sol"; -import {LibUint256Matrix, LibPointer, Pointer} from "src/lib/LibUint256Matrix.sol"; +import {LibUint256Array} from "../../../src/lib/LibUint256Array.sol"; +import {LibUint256Matrix, LibPointer, Pointer} from "../../../src/lib/LibUint256Matrix.sol"; /// The existing `flatten` tests assert the CONTENTS of the flattened array. /// `flatten` also performs an allocation, and an over-allocating `flatten` diff --git a/test/src/lib/LibUint256Matrix.endPointer.t.sol b/test/src/lib/LibUint256Matrix.endPointer.t.sol index 633cfa2..ddfc843 100644 --- a/test/src/lib/LibUint256Matrix.endPointer.t.sol +++ b/test/src/lib/LibUint256Matrix.endPointer.t.sol @@ -4,8 +4,8 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Array} from "src/lib/LibUint256Array.sol"; -import {LibUint256Matrix, LibPointer, Pointer} from "src/lib/LibUint256Matrix.sol"; +import {LibUint256Array} from "../../../src/lib/LibUint256Array.sol"; +import {LibUint256Matrix, LibPointer, Pointer} from "../../../src/lib/LibUint256Matrix.sol"; /// `endPointer` on a matrix is one word past the last REFERENCE, which is not /// the end of any allocation. The NatSpec on `endPointer` states where the inner diff --git a/test/src/lib/LibUint256Matrix.flatten.t.sol b/test/src/lib/LibUint256Matrix.flatten.t.sol index d97f502..8bb6a8f 100644 --- a/test/src/lib/LibUint256Matrix.flatten.t.sol +++ b/test/src/lib/LibUint256Matrix.flatten.t.sol @@ -3,10 +3,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Array} from "src/lib/LibUint256Array.sol"; -import {LibUint256Matrix} from "src/lib/LibUint256Matrix.sol"; -import {LibPointer, Pointer} from "src/lib/LibPointer.sol"; -import {LibUint256MatrixSlow} from "test/lib/LibUint256MatrixSlow.sol"; +import {LibUint256Array} from "../../../src/lib/LibUint256Array.sol"; +import {LibUint256Matrix} from "../../../src/lib/LibUint256Matrix.sol"; +import {LibPointer, Pointer} from "../../../src/lib/LibPointer.sol"; +import {LibUint256MatrixSlow} from "../../lib/LibUint256MatrixSlow.sol"; contract LibUint256MatrixFlattenTest is Test { using LibUint256Array for uint256[]; diff --git a/test/src/lib/LibUint256Matrix.itemCount.t.sol b/test/src/lib/LibUint256Matrix.itemCount.t.sol index 884111d..2b5b15f 100644 --- a/test/src/lib/LibUint256Matrix.itemCount.t.sol +++ b/test/src/lib/LibUint256Matrix.itemCount.t.sol @@ -3,10 +3,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Matrix} from "src/lib/LibUint256Matrix.sol"; -import {LibUint256Array} from "src/lib/LibUint256Array.sol"; -import {LibPointer, Pointer} from "src/lib/LibPointer.sol"; -import {LibUint256MatrixSlow} from "test/lib/LibUint256MatrixSlow.sol"; +import {LibUint256Matrix} from "../../../src/lib/LibUint256Matrix.sol"; +import {LibUint256Array} from "../../../src/lib/LibUint256Array.sol"; +import {LibPointer, Pointer} from "../../../src/lib/LibPointer.sol"; +import {LibUint256MatrixSlow} from "../../lib/LibUint256MatrixSlow.sol"; contract LibUint256MatrixItemCountTest is Test { using LibUint256Matrix for uint256[][]; diff --git a/test/src/lib/LibUint256Matrix.matrixFrom.t.sol b/test/src/lib/LibUint256Matrix.matrixFrom.t.sol index e608c54..277b95c 100644 --- a/test/src/lib/LibUint256Matrix.matrixFrom.t.sol +++ b/test/src/lib/LibUint256Matrix.matrixFrom.t.sol @@ -3,10 +3,10 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Array} from "src/lib/LibUint256Array.sol"; -import {LibUint256Matrix, LibPointer, Pointer} from "src/lib/LibUint256Matrix.sol"; +import {LibUint256Array} from "../../../src/lib/LibUint256Array.sol"; +import {LibUint256Matrix, LibPointer, Pointer} from "../../../src/lib/LibUint256Matrix.sol"; -import {LibUint256MatrixSlow} from "test/lib/LibUint256MatrixSlow.sol"; +import {LibUint256MatrixSlow} from "../../lib/LibUint256MatrixSlow.sol"; contract LibUint256MatrixMatrixFromTest is Test { using LibUint256Array for uint256; diff --git a/test/src/lib/LibUint256Matrix.pointer.t.sol b/test/src/lib/LibUint256Matrix.pointer.t.sol index 2092ddd..3457275 100644 --- a/test/src/lib/LibUint256Matrix.pointer.t.sol +++ b/test/src/lib/LibUint256Matrix.pointer.t.sol @@ -3,9 +3,9 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; -import {LibUint256Matrix, Pointer} from "src/lib/LibUint256Matrix.sol"; +import {LibUint256Matrix, Pointer} from "../../../src/lib/LibUint256Matrix.sol"; -import {LibUint256MatrixSlow} from "test/lib/LibUint256MatrixSlow.sol"; +import {LibUint256MatrixSlow} from "../../lib/LibUint256MatrixSlow.sol"; contract LibUint256MatrixPointerTest is Test { using LibUint256Matrix for uint256[][];