From ac72cd3b4516d28d2ace5d72ea98a076f54b5540 Mon Sep 17 00:00:00 2001 From: thedavidmeister Date: Sun, 19 Jan 2025 19:38:29 +0400 Subject: [PATCH] paths for intorastring --- foundry.toml | 1 + src/lib/op/logic/LibOpConditionsNP.sol | 2 +- src/lib/op/logic/LibOpEnsureNP.sol | 2 +- src/lib/parse/literal/LibParseLiteralString.sol | 2 +- test/src/lib/parse/LibParse.literalString.t.sol | 2 +- .../lib/parse/literal/LibParseLiteralString.parseString.t.sol | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/foundry.toml b/foundry.toml index b59d87364..16d65437d 100644 --- a/foundry.toml +++ b/foundry.toml @@ -38,6 +38,7 @@ remappings = [ "rain.solmem/=lib/rain.interpreter.interface/lib/rain.solmem/src/", "openzeppelin-contracts/=lib/rain.interpreter.interface/lib/openzeppelin-contracts/", "rain.math.float/=lib/rain.math.float/src/", + "rain.intorastring/=lib/rain.intorastring/src/", ] [fuzz] diff --git a/src/lib/op/logic/LibOpConditionsNP.sol b/src/lib/op/logic/LibOpConditionsNP.sol index 15924d876..cb4128fe5 100644 --- a/src/lib/op/logic/LibOpConditionsNP.sol +++ b/src/lib/op/logic/LibOpConditionsNP.sol @@ -5,7 +5,7 @@ import {Operand} from "rain.interpreter.interface/interface/unstable/IInterprete import {Pointer} from "rain.solmem/lib/LibPointer.sol"; import {IntegrityCheckStateNP} from "../../integrity/LibIntegrityCheckNP.sol"; import {InterpreterStateNP} from "../../state/LibInterpreterStateNP.sol"; -import {LibIntOrAString, IntOrAString} from "rain.intorastring/src/lib/LibIntOrAString.sol"; +import {LibIntOrAString, IntOrAString} from "rain.intorastring/lib/LibIntOrAString.sol"; /// @title LibOpConditionsNP /// @notice Opcode to return the first nonzero item on the stack up to the inputs diff --git a/src/lib/op/logic/LibOpEnsureNP.sol b/src/lib/op/logic/LibOpEnsureNP.sol index bfa82bdbe..d76d058dc 100644 --- a/src/lib/op/logic/LibOpEnsureNP.sol +++ b/src/lib/op/logic/LibOpEnsureNP.sol @@ -5,7 +5,7 @@ import {Pointer} from "rain.solmem/lib/LibPointer.sol"; import {Operand} from "rain.interpreter.interface/interface/unstable/IInterpreterV4.sol"; import {InterpreterStateNP} from "../../state/LibInterpreterStateNP.sol"; import {IntegrityCheckStateNP} from "../../integrity/LibIntegrityCheckNP.sol"; -import {LibIntOrAString, IntOrAString} from "rain.intorastring/src/lib/LibIntOrAString.sol"; +import {LibIntOrAString, IntOrAString} from "rain.intorastring/lib/LibIntOrAString.sol"; /// @title LibOpEnsureNP /// @notice Opcode to revert if the condition is zero. diff --git a/src/lib/parse/literal/LibParseLiteralString.sol b/src/lib/parse/literal/LibParseLiteralString.sol index d93127bc6..ae79a410b 100644 --- a/src/lib/parse/literal/LibParseLiteralString.sol +++ b/src/lib/parse/literal/LibParseLiteralString.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.18; import {ParseState} from "../LibParseState.sol"; -import {IntOrAString, LibIntOrAString} from "rain.intorastring/src/lib/LibIntOrAString.sol"; +import {IntOrAString, LibIntOrAString} from "rain.intorastring/lib/LibIntOrAString.sol"; import {UnclosedStringLiteral, StringTooLong} from "../../../error/ErrParse.sol"; import {CMASK_STRING_LITERAL_END, CMASK_STRING_LITERAL_TAIL} from "rain.string/lib/parse/LibParseCMask.sol"; import {LibParseError} from "../LibParseError.sol"; diff --git a/test/src/lib/parse/LibParse.literalString.t.sol b/test/src/lib/parse/LibParse.literalString.t.sol index e16da3b53..2d3c44547 100644 --- a/test/src/lib/parse/LibParse.literalString.t.sol +++ b/test/src/lib/parse/LibParse.literalString.t.sol @@ -5,7 +5,7 @@ import {Test} from "forge-std/Test.sol"; import {LibBytecode} from "rain.interpreter.interface/lib/bytecode/LibBytecode.sol"; import {LibParse} from "src/lib/parse/LibParse.sol"; import {LibMetaFixture} from "test/lib/parse/LibMetaFixture.sol"; -import {IntOrAString, LibIntOrAString} from "rain.intorastring/src/lib/LibIntOrAString.sol"; +import {IntOrAString, LibIntOrAString} from "rain.intorastring/lib/LibIntOrAString.sol"; import {StringTooLong, UnclosedStringLiteral} from "src/error/ErrParse.sol"; import {LibConformString} from "rain.string/lib/mut/LibConformString.sol"; import {LibParseState, ParseState} from "src/lib/parse/LibParseState.sol"; diff --git a/test/src/lib/parse/literal/LibParseLiteralString.parseString.t.sol b/test/src/lib/parse/literal/LibParseLiteralString.parseString.t.sol index 5556d6f9c..f01d18bec 100644 --- a/test/src/lib/parse/literal/LibParseLiteralString.parseString.t.sol +++ b/test/src/lib/parse/literal/LibParseLiteralString.parseString.t.sol @@ -4,7 +4,7 @@ pragma solidity =0.8.25; import {Test} from "forge-std/Test.sol"; import {LibParseLiteralString} from "src/lib/parse/literal/LibParseLiteralString.sol"; import {LibBytes, Pointer} from "rain.solmem/lib/LibBytes.sol"; -import {IntOrAString, LibIntOrAString} from "rain.intorastring/src/lib/LibIntOrAString.sol"; +import {IntOrAString, LibIntOrAString} from "rain.intorastring/lib/LibIntOrAString.sol"; import {LibParseState, ParseState} from "src/lib/parse/LibParseState.sol"; import {LibAllStandardOpsNP} from "src/lib/op/LibAllStandardOpsNP.sol"; import {CMASK_STRING_LITERAL_TAIL} from "rain.string/lib/parse/LibParseCMask.sol";