diff --git a/.github/workflows/core-contracts-storage-check.yml b/.github/workflows/core-contracts-storage-check.yml index 09ab91a68..917e14e95 100644 --- a/.github/workflows/core-contracts-storage-check.yml +++ b/.github/workflows/core-contracts-storage-check.yml @@ -4,7 +4,6 @@ on: push: branches: - development - - fix-core-contracts-storage-check pull_request: jobs: @@ -15,8 +14,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - fetch-depth: 2 # Ensure we can access the previous commit - + - name: Install Foundry uses: onbjerg/foundry-toolchain@v1 with: diff --git a/.github/workflows/diamond-storage-check.yml b/.github/workflows/diamond-storage-check.yml index 943ebd9c7..0626adf5f 100644 --- a/.github/workflows/diamond-storage-check.yml +++ b/.github/workflows/diamond-storage-check.yml @@ -4,7 +4,6 @@ on: push: branches: - development - - fix-core-contracts-storage-check paths: - '**.sol' pull_request: @@ -19,7 +18,6 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - fetch-depth: 2 - name: Install Foundry uses: onbjerg/foundry-toolchain@v1 diff --git a/packages/contracts/src/dollar/core/ERC20Ubiquity.sol b/packages/contracts/src/dollar/core/ERC20Ubiquity.sol index 6389fb3ff..e005cc262 100644 --- a/packages/contracts/src/dollar/core/ERC20Ubiquity.sol +++ b/packages/contracts/src/dollar/core/ERC20Ubiquity.sol @@ -25,8 +25,6 @@ abstract contract ERC20Ubiquity is ERC20PermitUpgradeable, ERC20PausableUpgradeable { - // this is a non-colliding change - /// @notice Token symbol string private _symbol; diff --git a/packages/contracts/src/dollar/core/ThisIsATest.sol b/packages/contracts/src/dollar/core/ThisIsATest.sol deleted file mode 100644 index 752aa0bba..000000000 --- a/packages/contracts/src/dollar/core/ThisIsATest.sol +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: UNLICENSED -pragma solidity 0.8.19; - -contract ThisIsATest { - address var2; - address var1; -} diff --git a/packages/contracts/src/dollar/libraries/LibAppStorage.sol b/packages/contracts/src/dollar/libraries/LibAppStorage.sol index a4670bc1e..e7b94dd4d 100644 --- a/packages/contracts/src/dollar/libraries/LibAppStorage.sol +++ b/packages/contracts/src/dollar/libraries/LibAppStorage.sol @@ -7,8 +7,6 @@ import "./Constants.sol"; /// @notice Shared struct used as a storage in the `LibAppStorage` library struct AppStorage { - // this is a non-colliding change - // reentrancy guard uint256 reentrancyStatus; // others diff --git a/packages/contracts/src/dollar/libraries/LibThisIsATest.sol b/packages/contracts/src/dollar/libraries/LibThisIsATest.sol deleted file mode 100644 index d3299b626..000000000 --- a/packages/contracts/src/dollar/libraries/LibThisIsATest.sol +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: UNLICENSED -pragma solidity 0.8.19; - -library ThisIsATest { - function test() external pure { - address var2; - uint256 var1; - var1++; - } -}