Skip to content

Commit

Permalink
chore: reorganize reader files (#170)
Browse files Browse the repository at this point in the history
## Description

Since it's now only used by new tests. `StorageAccessibleWrapper.sol`
can be moved away from `test/src/` (folder which should disappear at
some point anyway).

Because of this, I also updated Solidity pragmas. I was lenient with the
version (`^0.8.0`) because there's no need to enforce restrictive
versions for tests. I had to lower the pragmas in tests when I suspected
a compiler regression and wanted to test it, and this was avoidably
annoying.

## Test Plan

CI.
  • Loading branch information
fedgiac authored Jul 11, 2024
1 parent 97d97c5 commit f64f5df
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
6 changes: 2 additions & 4 deletions test/reader/StorageAccessible.t.sol
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
// SPDX-License-Identifier: LGPL-3.0-or-later

pragma solidity >=0.7.6 <0.9.0;
pragma abicoder v2;
pragma solidity ^0.8.0;

import {Test, Vm} from "forge-std/Test.sol";
import {StorageAccessibleWrapper, ExternalStorageReader} from "test/src/vendor/StorageAccessibleWrapper.sol";
import {StorageAccessibleWrapper, ExternalStorageReader} from "./StorageAccessibleWrapper.sol";
import {ViewStorageAccessible} from "src/contracts/mixins/StorageAccessible.sol";

contract StorageAccessibleTest is Test {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: LGPL-3.0-only
pragma solidity >=0.7.6 <0.9.0;
pragma solidity ^0.8.0;

import "src/contracts/mixins/StorageAccessible.sol";

Expand Down
6 changes: 3 additions & 3 deletions test/reader/StorageReadable.t.sol
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
pragma solidity >=0.7.6 <0.9.0;
pragma abicoder v2;
pragma solidity ^0.8.0;

import {Test} from "forge-std/Test.sol";
import {StorageAccessibleWrapper} from "test/src/vendor/StorageAccessibleWrapper.sol";

import {StorageAccessibleWrapper} from "./StorageAccessibleWrapper.sol";

contract StorageReadableTest is Test {
StorageAccessibleWrapper instance;
Expand Down
8 changes: 4 additions & 4 deletions test/reader/ViewStorageAccessible.t.sol
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: LGPL-3.0-or-later

pragma solidity >=0.7.6 <0.9.0;
pragma abicoder v2;
pragma solidity ^0.8.0;

import {Test} from "forge-std/Test.sol";
import {StorageAccessibleWrapper, ExternalStorageReader} from "test/src/vendor/StorageAccessibleWrapper.sol";

import {ViewStorageAccessible} from "src/contracts/mixins/StorageAccessible.sol";

import {StorageAccessibleWrapper, ExternalStorageReader} from "./StorageAccessibleWrapper.sol";

contract StorageAccessibleTest is Test {
StorageAccessibleWrapper instance;
ExternalStorageReader reader;
Expand Down

0 comments on commit f64f5df

Please sign in to comment.