Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cbor_metadata = false

evm_version = "cancun"

# No cheatcode in forge-std 1.16.1 creates a symlink, so the tests that pin what
# No cheatcode in forge-std 1.16.2 creates a symlink, so the tests that pin what
# this library does when it finds one at a generated path build it with `ln`.
ffi = true

Expand All @@ -39,7 +39,7 @@ tab_width = 4
runs = 2048

[dependencies]
forge-std = "1.16.1"
forge-std = "1.16.2"

[soldeer]
recursive_deps = false
2 changes: 1 addition & 1 deletion remappings.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
forge-std-1.16.1/=dependencies/forge-std-1.16.1/
forge-std-1.16.2/=dependencies/forge-std-1.16.2/
8 changes: 4 additions & 4 deletions soldeer.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[[dependencies]]
name = "forge-std"
version = "1.16.1"
url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_16_1_08-05-2026_08:51:16_forge-std-1.16.zip"
checksum = "839b61832925c7152c7b6dffbfa4998d9e606211179bd8f604733124e8a7cb57"
integrity = "60e55d10150354ca4a1e2985c5456c834b92b82ef85ab0e1d92a7786cddbd219"
version = "1.16.2"
url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_16_2_03-07-2026_07:37:45_forge-std-1.16.zip"
checksum = "405dccc9d60d753f6abc412b4adf0359f4390f65dbadbbb277a12b4946ed8969"
integrity = "5fb4325b60d7d4194bd0481e2f94398cf1d9c6561dd12a66fb2748ef4a68205f"
2 changes: 1 addition & 1 deletion src/lib/LibCodeGen.sol
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 {Vm} from "forge-std-1.16.1/src/Vm.sol";
import {Vm} from "forge-std-1.16.2/src/Vm.sol";
import {IOpcodeToolingV1} from "../interface/IOpcodeToolingV1.sol";
import {IParserToolingV1} from "../interface/IParserToolingV1.sol";
import {ISubParserToolingV1} from "../interface/ISubParserToolingV1.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/lib/LibFs.sol
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 {Vm} from "forge-std-1.16.1/src/Vm.sol";
import {Vm} from "forge-std-1.16.2/src/Vm.sol";
import {LibCodeGen} from "./LibCodeGen.sol";

/// @dev The directory that generated contract files are written to, relative to
Expand Down
2 changes: 1 addition & 1 deletion src/lib/LibHexString.sol
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 {Vm} from "forge-std-1.16.1/src/Vm.sol";
import {Vm} from "forge-std-1.16.2/src/Vm.sol";

/// Thrown when the `Vm` handed to `bytesToHex` does not return the string that
/// `toString(bytes)` is defined to return, which is "0x" followed by exactly two
Expand Down
2 changes: 1 addition & 1 deletion test/concrete/LibFsExternal.sol
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 {Vm} from "forge-std-1.16.1/src/Vm.sol";
import {Vm} from "forge-std-1.16.2/src/Vm.sol";
import {LibFs} from "src/lib/LibFs.sol";

/// @title LibFsExternal
Expand Down
2 changes: 1 addition & 1 deletion test/concrete/LibHexStringExternal.sol
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 {Vm} from "forge-std-1.16.1/src/Vm.sol";
import {Vm} from "forge-std-1.16.2/src/Vm.sol";
import {LibHexString} from "src/lib/LibHexString.sol";

/// @title LibHexStringExternal
Expand Down
2 changes: 1 addition & 1 deletion test/lib/LibCodeGenSlow.sol
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 {Vm} from "forge-std-1.16.1/src/Vm.sol";
import {Vm} from "forge-std-1.16.2/src/Vm.sol";

/// @dev `forge fmt`'s own `line_length` default. Written out here rather than
/// imported from `LibCodeGen` so that this reference does not move when the
Expand Down
2 changes: 1 addition & 1 deletion test/src/interface/IIntegrityToolingV1.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {IIntegrityToolingV1} from "src/interface/IIntegrityToolingV1.sol";
import {ToolingMock} from "test/concrete/ToolingMock.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/src/interface/IOpcodeToolingV1.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {IOpcodeToolingV1} from "src/interface/IOpcodeToolingV1.sol";
import {ToolingMock} from "test/concrete/ToolingMock.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/src/interface/IParserToolingV1.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {IParserToolingV1} from "src/interface/IParserToolingV1.sol";
import {ToolingMock} from "test/concrete/ToolingMock.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/src/interface/ISubParserToolingV1.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {ISubParserToolingV1} from "src/interface/ISubParserToolingV1.sol";
import {ToolingMock} from "test/concrete/ToolingMock.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/LibCodeGen.addressConstantString.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen, MAX_LINE_LENGTH} from "src/lib/LibCodeGen.sol";
import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/LibCodeGen.bytecodeHashConstantString.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen, MAX_LINE_LENGTH, CodelessInstance} from "src/lib/LibCodeGen.sol";
import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";
import {CodeGennable} from "test/concrete/CodeGennable.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/LibCodeGen.bytes32ConstantString.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen, MAX_LINE_LENGTH} from "src/lib/LibCodeGen.sol";
import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/LibCodeGen.bytesConstantString.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen, MAX_LINE_LENGTH} from "src/lib/LibCodeGen.sol";
import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/LibCodeGen.commentPrefix.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen} from "src/lib/LibCodeGen.sol";
import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";

Expand Down
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen, MAX_LINE_LENGTH, InvalidContractName} from "src/lib/LibCodeGen.sol";
import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/LibCodeGen.filePrefix.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen} from "src/lib/LibCodeGen.sol";

/// @title LibCodeGenFilePrefixTest
Expand Down
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen} from "src/lib/LibCodeGen.sol";
import {IIntegrityToolingV1} from "src/interface/IIntegrityToolingV1.sol";
import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";
Expand Down
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen} from "src/lib/LibCodeGen.sol";
import {IParserToolingV1} from "src/interface/IParserToolingV1.sol";
import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/LibCodeGen.maxLineLength.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {MAX_LINE_LENGTH, NEWLINE_DUE_TO_MAX_LENGTH} from "src/lib/LibCodeGen.sol";

/// @title LibCodeGenMaxLineLengthTest
Expand Down
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen} from "src/lib/LibCodeGen.sol";
import {IOpcodeToolingV1} from "src/interface/IOpcodeToolingV1.sol";
import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";
Expand Down
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen} from "src/lib/LibCodeGen.sol";
import {IParserToolingV1} from "src/interface/IParserToolingV1.sol";
import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/LibCodeGen.requireContractName.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen, InvalidContractName} from "src/lib/LibCodeGen.sol";
import {LibCodeGenSlow, SLOW_HEAD_ALPHABET, SLOW_TAIL_ALPHABET} from "test/lib/LibCodeGenSlow.sol";

Expand Down
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen} from "src/lib/LibCodeGen.sol";
import {ISubParserToolingV1} from "src/interface/ISubParserToolingV1.sol";
import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/LibCodeGen.uint8ConstantString.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibCodeGen, MAX_LINE_LENGTH} from "src/lib/LibCodeGen.sol";
import {LibCodeGenSlow} from "test/lib/LibCodeGenSlow.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/LibFs.buildFileForContract.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibFs, GENERATED_DIR} from "src/lib/LibFs.sol";
import {InvalidContractName} from "src/lib/LibCodeGen.sol";
import {CodeGennable} from "test/concrete/CodeGennable.sol";
Expand Down
6 changes: 3 additions & 3 deletions test/src/lib/LibFs.isPresent.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test} from "forge-std-1.16.1/src/Test.sol";
import {VmSafe} from "forge-std-1.16.1/src/Vm.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {VmSafe} from "forge-std-1.16.2/src/Vm.sol";
import {LibFs, GENERATED_DIR} from "src/lib/LibFs.sol";

/// @title LibFsIsPresentTest
/// @notice `isPresent` is what stands between `buildFileForContract` and a write
/// that lands somewhere other than the path it was given, so what it answers for
/// a symlink is asserted here together with the write that depends on it.
///
/// Symlinks are built with `ln` because forge-std 1.16.1 has no cheatcode that
/// Symlinks are built with `ln` because forge-std 1.16.2 has no cheatcode that
/// creates one, and they are read back with `readlink`, which reports the path
/// itself and fails on anything that is not a symlink. `vm.readLink` is what the
/// library uses, so it is deliberately not what asserts here.
Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/LibFs.t.sol
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 {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {LibFs, GENERATED_DIR} from "src/lib/LibFs.sol";
import {InvalidContractName} from "src/lib/LibCodeGen.sol";
import {LibFsExternal} from "test/concrete/LibFsExternal.sol";
Expand Down
4 changes: 2 additions & 2 deletions test/src/lib/LibHexString.bytesToHex.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test} from "forge-std-1.16.1/src/Test.sol";
import {Vm} from "forge-std-1.16.1/src/Vm.sol";
import {Test} from "forge-std-1.16.2/src/Test.sol";
import {Vm} from "forge-std-1.16.2/src/Vm.sol";
import {LibHexString, UnexpectedHexString} from "src/lib/LibHexString.sol";
import {LibCodeGen} from "src/lib/LibCodeGen.sol";
import {LibHexStringExternal} from "test/concrete/LibHexStringExternal.sol";
Expand Down
Loading