lints

Author: thedavidmeister

script/Deploy.sol

@@ -16,7 +16,6 @@ import {
 import {Receipt as ReceiptContract} from "src/concrete/receipt/Receipt.sol";
 import {SceptreStakedFlrOracle} from "src/concrete/oracle/SceptreStakedFlrOracle.sol";
 import {TwoPriceOracleV2, TwoPriceOracleConfigV2} from "src/concrete/oracle/TwoPriceOracleV2.sol";
-import {IStakedFlr} from "rain.flare/interface/IStakedFlr.sol";
 import {FtsoV2LTSFeedOracle, FtsoV2LTSFeedOracleConfig} from "src/concrete/oracle/FtsoV2LTSFeedOracle.sol";
 import {FLR_USD_FEED_ID} from "rain.flare/lib/lts/LibFtsoV2LTS.sol";
 import {IPriceOracleV2} from "src/interface/IPriceOracleV2.sol";
@@ -51,6 +50,7 @@ contract Deploy is Script {
 
     function deployStakedFlrPriceVault(uint256 deploymentKey) internal {
         vm.startBroadcast(deploymentKey);
+        //forge-lint: disable-next-line(mixed-case-variable)
         IPriceOracleV2 ftsoV2LTSFeedOracle = IPriceOracleV2(
             new FtsoV2LTSFeedOracle(
                 FtsoV2LTSFeedOracleConfig({

src/concrete/authorize/OffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol

@@ -12,7 +12,7 @@ import {SafeERC20Upgradeable as SafeERC20} from
     "openzeppelin-contracts-upgradeable/contracts/token/ERC20/utils/SafeERC20Upgradeable.sol";
 import {IERC20Upgradeable as IERC20} from
     "openzeppelin-contracts-upgradeable/contracts/token/ERC20/IERC20Upgradeable.sol";
-import {DEPOSIT, WITHDRAW, DepositStateChange} from "../vault/OffchainAssetReceiptVault.sol";
+import {DEPOSIT, DepositStateChange} from "../vault/OffchainAssetReceiptVault.sol";
 import {OwnableUpgradeable as Ownable} from "openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
 import {IERC20MetadataUpgradeable as IERC20Metadata} from
     "openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";

src/concrete/receipt/ERC20PriceOracleReceipt.sol

@@ -85,6 +85,7 @@ contract ERC20PriceOracleReceipt is Receipt {
     /// Provides the URL for redeeming receipts. Can be overridden to provide a
     /// custom redeem URL. Default is an empty string, which will not include a
     /// redeem URL in the metadata json.
+    //forge-lint: disable-next-line(mixed-case-function)
     function _redeemURL() internal view virtual returns (string memory) {
         return DEFAULT_REDEEM_URL;
     }

src/concrete/vault/ERC20PriceOracleReceiptVault.sol

@@ -2,8 +2,6 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {IERC20Upgradeable as IERC20} from
-    "openzeppelin-contracts-upgradeable/contracts/token/ERC20/IERC20Upgradeable.sol";
 import {
     ReceiptVaultConfig,
     VaultConfig,
@@ -19,6 +17,7 @@ import {IPriceOracleV2} from "../../interface/IPriceOracleV2.sol";
 /// by a factory to build the full config.
 /// @param priceOracle as per `ERC20PriceOracleReceiptVaultConfig`.
 /// @param vaultConfig config for the underlying `ReceiptVault`.
+//forge-lint: disable-next-line(pascal-case-struct)
 struct ERC20PriceOracleVaultConfig {
     IPriceOracleV2 priceOracle;
     VaultConfig vaultConfig;
@@ -27,6 +26,7 @@ struct ERC20PriceOracleVaultConfig {
 /// @param priceOracle The price oracle that will be permanently bound to the
 /// `ERC20PriceOracleVault` upon initialization.
 /// @param receiptVaultConfig All config for the underlying receipt vault.
+//forge-lint: disable-next-line(pascal-case-struct)
 struct ERC20PriceOracleReceiptVaultConfig {
     IPriceOracleV2 priceOracle;
     ReceiptVaultConfig receiptVaultConfig;

src/concrete/vault/OffchainAssetReceiptVault.sol

@@ -13,7 +13,6 @@ import {
 } from "../../abstract/ReceiptVault.sol";
 import {IReceiptV3} from "../../interface/IReceiptV3.sol";
 import {MathUpgradeable as Math} from "openzeppelin-contracts-upgradeable/contracts/utils/math/MathUpgradeable.sol";
-import {ITierV2} from "rain.tier.interface/interface/ITierV2.sol";
 import {IAuthorizeV1, Unauthorized} from "../../interface/IAuthorizeV1.sol";
 import {IERC165Upgradeable as IERC165} from
     "openzeppelin-contracts-upgradeable/contracts/utils/introspection/IERC165Upgradeable.sol";

test/abstract/ERC20PriceOracleReceiptVaultTest.sol

@@ -50,7 +50,7 @@ contract ERC20PriceOracleReceiptVaultTest is Test {
     }
 
     /// Get Receipt from event
-    function getReceipt() internal returns (ReceiptContract) {
+    function getReceipt() internal view returns (ReceiptContract) {
         Vm.Log[] memory logs = vm.getRecordedLogs();
 
         // Find the ERC20PriceOracleReceiptVaultInitialized event log

test/abstract/ReceiptFactoryTest.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.25;
 
 import {ICloneableFactoryV2} from "rain.factory/interface/ICloneableFactoryV2.sol";
 import {CloneFactory} from "rain.factory/concrete/CloneFactory.sol";
-import {Test, Vm} from "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 import {Receipt as ReceiptContract} from "src/concrete/receipt/Receipt.sol";
 import {ERC20PriceOracleReceipt} from "src/concrete/receipt/ERC20PriceOracleReceipt.sol";
 import {DATA_URI_BASE64_PREFIX} from "src/concrete/receipt/Receipt.sol";

test/lib/LibERC20PriceOracleReceiptVaultFork.sol

@@ -17,15 +17,15 @@ import {LibSceptreStakedFlare} from "rain.flare/lib/sflr/LibSceptreStakedFlare.s
 library LibERC20PriceOracleReceiptVaultFork {
     using LibFixedPointDecimalArithmeticOpenZeppelin for uint256;
 
+    uint256 constant BLOCK_NUMBER = 31725348;
+
     function setup(Vm vm, uint256 amount) internal returns (ERC20PriceOracleReceiptVault, address) {
         address alice = address(uint160(uint256(keccak256("ALICE"))));
 
         // Contract address on Flare
         ERC20PriceOracleReceiptVault vault =
             ERC20PriceOracleReceiptVault(payable(0xf0363b922299EA467d1E9c0F9c37d89830d9a4C4));
 
-        uint256 BLOCK_NUMBER = 31725348;
-
         vm.createSelectFork(LibFork.rpcUrlFlare(vm), BLOCK_NUMBER);
 
         vm.startPrank(alice);

test/src/concrete/authorize/OffchainAssetReceiptVaultPaymentMintAuthorizerV1.authorize.t.sol

@@ -9,8 +9,6 @@ import {
     OffchainAssetReceiptVaultPaymentMintAuthorizerV1Config,
     ZeroReceiptVault,
     ZeroInitialOwner,
-    ZeroPaymentToken,
-    ZeroMaxSharesSupply,
     Unauthorized
 } from "src/concrete/authorize/OffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol";
 import {
@@ -25,7 +23,6 @@ import {
 import {CloneFactory} from "rain.factory/concrete/CloneFactory.sol";
 import {IERC20MetadataUpgradeable as IERC20Metadata} from
     "openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
-import {ICloneableV2} from "rain.factory/interface/ICloneableV2.sol";
 import {VerifyAlwaysApproved} from "rain.verify.interface/concrete/VerifyAlwaysApproved.sol";
 
 contract OffchainAssetReceiptVaultPaymentMintAuthorizerV1IERC165Test is OffchainAssetReceiptVaultAuthorizerV1Test {

test/src/concrete/authorize/OffchainAssetReceiptVaultPaymentMintAuthorizerV1.deposit.t.sol

@@ -4,8 +4,6 @@ pragma solidity =0.8.25;
 
 import {OffchainAssetReceiptVaultAuthorizerV1Test} from "test/abstract/OffchainAssetReceiptVaultAuthorizerV1Test.sol";
 import {CloneFactory} from "rain.factory/concrete/CloneFactory.sol";
-import {IERC20MetadataUpgradeable as IERC20Metadata} from
-    "openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
 import {
     OffchainAssetReceiptVaultPaymentMintAuthorizerV1,
     PaymentTokenDecimalMismatch,
@@ -14,8 +12,6 @@ import {
 } from "src/concrete/authorize/OffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol";
 import {OffchainAssetReceiptVaultPaymentMintAuthorizerV1Config} from
     "src/concrete/authorize/OffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol";
-import {IERC165} from "openzeppelin-contracts/contracts/utils/introspection/IERC165.sol";
-import {ICloneableV2} from "rain.factory/interface/ICloneableV2.sol";
 import {DepositStateChange, DEPOSIT, CERTIFY} from "src/concrete/vault/OffchainAssetReceiptVault.sol";
 import {IERC20Upgradeable as IERC20} from
     "openzeppelin-contracts-upgradeable/contracts/token/ERC20/IERC20Upgradeable.sol";
@@ -29,19 +25,18 @@ import {
 import {VerifyAlwaysApproved} from "rain.verify.interface/concrete/VerifyAlwaysApproved.sol";
 import {LibFixedPointDecimalScale, FLAG_ROUND_UP} from "rain.math.fixedpoint/lib/LibFixedPointDecimalScale.sol";
 import {ICloneableFactoryV2} from "rain.factory/interface/ICloneableFactoryV2.sol";
-import {LibOffchainAssetVaultCreator} from "../../../lib/LibOffchainAssetVaultCreator.sol";
 
 import {TestErc20} from "test/concrete/TestErc20.sol";
 
 contract OffchainAssetReceiptVaultPaymentMintAuthorizerV1DepositTest is OffchainAssetReceiptVaultAuthorizerV1Test {
     ICloneableFactoryV2 internal immutable iFactory;
     ReceiptContract internal immutable iReceiptImplementation;
-    OffchainAssetReceiptVault internal immutable iImplementation;
+    OffchainAssetReceiptVault internal immutable I_IMPLEMENTATION;
 
     constructor() {
         iFactory = new CloneFactory();
         iReceiptImplementation = new ReceiptContract();
-        iImplementation = new OffchainAssetReceiptVault(
+        I_IMPLEMENTATION = new OffchainAssetReceiptVault(
             ReceiptVaultConstructionConfigV2({factory: iFactory, receiptImplementation: iReceiptImplementation})
         );
     }
@@ -417,7 +412,7 @@ contract OffchainAssetReceiptVaultPaymentMintAuthorizerV1DepositTest is Offchain
         });
         // Use the factory to create the child contract
         OffchainAssetReceiptVault receiptVault = OffchainAssetReceiptVault(
-            payable(iFactory.clone(address(iImplementation), abi.encode(offchainAssetVaultConfig)))
+            payable(iFactory.clone(address(I_IMPLEMENTATION), abi.encode(offchainAssetVaultConfig)))
         );
 
         vm.prank(alice);