Skip to content

rewrite test src/ imports to relative paths #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thedavidmeister wants to merge 1 commit into
base: main
Choose a base branch
from
Open

rewrite test src/ imports to relative paths #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/abstract/FlowTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import {CloneFactory} from "rain.factory/src/concrete/CloneFactory.sol";
import {LibLogHelper} from "test/lib/LibLogHelper.sol";
import {LibStackGeneration} from "test/lib/LibStackGeneration.sol";
import {Address} from "openzeppelin-contracts/contracts/utils/Address.sol";
import {FlowTransferV1, IFlowV5, RAIN_FLOW_SENTINEL, Sentinel} from "src/interface/IFlowV5.sol";
import {Flow} from "src/concrete/Flow.sol";
import {FlowTransferV1, IFlowV5, RAIN_FLOW_SENTINEL, Sentinel} from "../../src/interface/IFlowV5.sol";
import {Flow} from "../../src/concrete/Flow.sol";
import {LibUint256Matrix} from "rain.solmem/lib/LibUint256Matrix.sol";
import {LibUint256Array} from "rain.solmem/lib/LibUint256Array.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/abstract/FlowTransferOperation.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
ERC721Transfer,
ERC1155Transfer,
RAIN_FLOW_SENTINEL
} from "src/interface/IFlowV5.sol";
} from "../../src/interface/IFlowV5.sol";
import {REVERTING_MOCK_BYTECODE} from "./TestConstants.sol";
import {Sentinel} from "rain.solmem/lib/LibStackSentinel.sol";
import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/abstract/FlowUtilsAbstractTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity ^0.8.25;

import {Vm} from "forge-std/Test.sol";

import {FlowTransferV1, RAIN_FLOW_SENTINEL} from "src/interface/IFlowV5.sol";
import {FlowTransferV1, RAIN_FLOW_SENTINEL} from "../../src/interface/IFlowV5.sol";
import {Sentinel} from "rain.solmem/lib/LibStackSentinel.sol";
import {LibStackGeneration} from "test/lib/LibStackGeneration.sol";
import {LibLogHelper} from "test/lib/LibLogHelper.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/interface/IFlowV5.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity =0.8.25;

import {Test} from "forge-std/Test.sol";

import {RAIN_FLOW_SENTINEL} from "src/interface/deprecated/v4/IFlowV4.sol";
import {RAIN_FLOW_SENTINEL} from "../../src/interface/deprecated/v4/IFlowV4.sol";
import {Sentinel} from "rain.solmem/lib/LibStackSentinel.sol";

contract IFlowV5Test is Test {
Expand Down
2 changes: 1 addition & 1 deletion test/interface/deprecated/v4/IFlowV4.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity =0.8.25;

import {Test} from "forge-std/Test.sol";

import {RAIN_FLOW_SENTINEL} from "src/interface/deprecated/v4/IFlowV4.sol";
import {RAIN_FLOW_SENTINEL} from "../../../../src/interface/deprecated/v4/IFlowV4.sol";
import {Sentinel} from "rain.solmem/lib/LibStackSentinel.sol";

contract IFlowV4Test is Test {
Expand Down
2 changes: 1 addition & 1 deletion test/lib/LibStackGeneration.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity ^0.8.25;

import {FlowTransferV1} from "src/interface/IFlowV5.sol";
import {FlowTransferV1} from "../../src/interface/IFlowV5.sol";

library LibStackGeneration {
function generateFlowStack(uint256 sentinel, FlowTransferV1 memory flowTransfer)
Expand Down
2 changes: 1 addition & 1 deletion test/src/concrete/Flow.construction.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {Vm} from "forge-std/Test.sol";

import {EvaluableConfigV3} from "rain.interpreter.interface/interface/IInterpreterCallerV2.sol";
import {FlowTest} from "test/abstract/FlowTest.sol";
import {EmptyFlowConfig} from "src/error/ErrFlow.sol";
import {EmptyFlowConfig} from "../../../src/error/ErrFlow.sol";

contract FlowConstructionTest is FlowTest {
function testFlowConstructionEmptyConfigReverts() external {
Expand Down
4 changes: 2 additions & 2 deletions test/src/concrete/Flow.context.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
pragma solidity =0.8.25;

import {FlowTest} from "test/abstract/FlowTest.sol";
import {IFlowV5} from "src/interface/IFlowV5.sol";
import {IFlowV5} from "../../../src/interface/IFlowV5.sol";
import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
import {FLOW_MAX_OUTPUTS, FLOW_ENTRYPOINT} from "src/concrete/Flow.sol";
import {FLOW_MAX_OUTPUTS, FLOW_ENTRYPOINT} from "../../../src/concrete/Flow.sol";
import {LibEncodedDispatch} from "rain.interpreter.interface/lib/caller/LibEncodedDispatch.sol";
import {SignedContextV1} from "rain.interpreter.interface/interface/IInterpreterCallerV2.sol";
import {LibContextWrapper} from "test/lib/LibContextWrapper.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/src/concrete/Flow.expression.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pragma solidity =0.8.25;
import {Vm} from "forge-std/Test.sol";

import {FlowTest} from "test/abstract/FlowTest.sol";
import {IFlowV5} from "src/interface/IFlowV5.sol";
import {IFlowV5} from "../../../src/interface/IFlowV5.sol";
import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
import {SignedContextV1} from "rain.interpreter.interface/interface/IInterpreterCallerV2.sol";
import {LibUint256Matrix} from "rain.solmem/lib/LibUint256Matrix.sol";
Expand Down
4 changes: 2 additions & 2 deletions test/src/concrete/Flow.multicall.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
pragma solidity =0.8.25;

import {FlowTest} from "test/abstract/FlowTest.sol";
import {IFlowV5} from "src/interface/IFlowV5.sol";
import {FLOW_MAX_OUTPUTS, FLOW_ENTRYPOINT} from "src/concrete/Flow.sol";
import {IFlowV5} from "../../../src/interface/IFlowV5.sol";
import {FLOW_MAX_OUTPUTS, FLOW_ENTRYPOINT} from "../../../src/concrete/Flow.sol";
import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
import {SignedContextV1} from "rain.interpreter.interface/interface/IInterpreterCallerV2.sol";
import {LibEncodedDispatch} from "rain.interpreter.interface/lib/caller/LibEncodedDispatch.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/src/concrete/Flow.preview.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
ERC1155Transfer,
RAIN_FLOW_SENTINEL,
Sentinel
} from "src/interface/IFlowV5.sol";
} from "../../../src/interface/IFlowV5.sol";
import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
import {LibEvaluable} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/src/concrete/Flow.signedContext.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pragma solidity =0.8.25;
import {Vm} from "forge-std/Test.sol";
import {FlowTest} from "test/abstract/FlowTest.sol";
import {SignContextLib} from "test/lib/SignContextLib.sol";
import {IFlowV5} from "src/interface/IFlowV5.sol";
import {IFlowV5} from "../../../src/interface/IFlowV5.sol";
import {EvaluableV2, SignedContextV1} from "rain.interpreter.interface/interface/IInterpreterCallerV2.sol";
import {InvalidSignature} from "rain.interpreter.interface/lib/caller/LibContext.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/src/concrete/Flow.time.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity =0.8.25;

import {FlowTest} from "test/abstract/FlowTest.sol";
import {IFlowV5} from "src/interface/IFlowV5.sol";
import {IFlowV5} from "../../../src/interface/IFlowV5.sol";
import {EvaluableV2, SignedContextV1} from "rain.interpreter.interface/interface/IInterpreterCallerV2.sol";
import {DEFAULT_STATE_NAMESPACE} from "rain.interpreter.interface/interface/IInterpreterV2.sol";
import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/IInterpreterStoreV2.sol";
Expand Down
6 changes: 3 additions & 3 deletions test/src/concrete/Flow.transfer.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
ERC1155Transfer,
RAIN_FLOW_SENTINEL,
Sentinel
} from "src/interface/IFlowV5.sol";
} from "../../../src/interface/IFlowV5.sol";
import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
import {SignedContextV1} from "rain.interpreter.interface/interface/IInterpreterCallerV2.sol";
Expand All @@ -21,9 +21,9 @@ import {
UnsupportedERC721Flow,
UnsupportedERC1155Flow,
UnregisteredFlow
} from "src/error/ErrFlow.sol";
} from "../../../src/error/ErrFlow.sol";

import {FLOW_ENTRYPOINT, FLOW_MAX_OUTPUTS} from "src/concrete/Flow.sol";
import {FLOW_ENTRYPOINT, FLOW_MAX_OUTPUTS} from "../../../src/concrete/Flow.sol";
import {LibEncodedDispatch} from "rain.interpreter.interface/lib/caller/LibEncodedDispatch.sol";
import {LibContextWrapper} from "test/lib/LibContextWrapper.sol";
import {IERC721} from "openzeppelin-contracts/contracts/token/ERC721/IERC721.sol";
Expand Down
Loading