Skip to content

Commit

Permalink
fixing other errors, like non-explict type
Browse files Browse the repository at this point in the history
  • Loading branch information
josojo committed Jan 10, 2024
1 parent a3a2045 commit 738f131
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 15 deletions.
1 change: 0 additions & 1 deletion .solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"func-visibility": ["warn",{"ignoreConstructors":true}],
"custom-errors": "off",
"reason-string": "off",
"explicit-types": "off",
"one-contract-per-file": "off"
}
}
3 changes: 0 additions & 3 deletions contracts/AdjudicationFramework.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ pragma solidity ^0.8.20;
/* solhint-disable not-rely-on-time */

import {BalanceHolder} from "./lib/reality-eth/BalanceHolder.sol";

import {IRealityETH} from "./lib/reality-eth/interfaces/IRealityETH.sol";
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";

/*
Expand Down
2 changes: 1 addition & 1 deletion contracts/L1GlobalForkRequester.sol
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ contract L1GlobalForkRequester {
);

if (doYesToken) {
uint newAmountToMigrate = amount -
uint256 newAmountToMigrate = amount -
failedRequests[token][requester][requestId].amountMigratedYes;
failedRequests[yesToken][requester][requestId]
.amount += newAmountToMigrate;
Expand Down
1 change: 0 additions & 1 deletion test/AdjudicationIntegration.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import {RealityETH_v3_0} from "../contracts/lib/reality-eth/RealityETH-3.0.sol";
import {AdjudicationFramework} from "../contracts/AdjudicationFramework.sol";

import {L2ForkArbitrator} from "../contracts/L2ForkArbitrator.sol";
import {L1GlobalChainInfoPublisher} from "../contracts/L1GlobalChainInfoPublisher.sol";
import {L1GlobalForkRequester} from "../contracts/L1GlobalForkRequester.sol";
import {L2ChainInfo} from "../contracts/L2ChainInfo.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/ForkableBridge.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ contract ForkableBridgeTest is Test {
address forkableToken = forkableBridge.tokenInfoToWrappedToken(
tokenInfoHash
);
for (uint i = 0; i < 32; i++) {
for (uint256 i = 0; i < 32; i++) {
depositTreeHashes[i] = forkableBridge.branch(i);
}
// initialize the child contracts to set the parent contract
Expand Down
4 changes: 2 additions & 2 deletions test/ForkableZkEVM.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ contract ForkableZkEVMTest is Test {
);
bytes32 newStateRoot = keccak256(abi.encodePacked("newStateRoot"));
bytes32[24] memory proof;
for (uint i = 0; i < 24; i++) {
for (uint256 i = 0; i < 24; i++) {
proof[i] = bytes32(abi.encodePacked("proof", i));
}

Expand All @@ -150,7 +150,7 @@ contract ForkableZkEVMTest is Test {
forkableZkEVM.consolidatePendingState(10);

bytes32[24] memory proof;
for (uint i = 0; i < 24; i++) {
for (uint256 i = 0; i < 24; i++) {
proof[i] = bytes32("0x"); // Whatever initialization value you want
}

Expand Down
6 changes: 0 additions & 6 deletions test/L1GlobalChainInfoPublisher.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ pragma solidity ^0.8.20;
import {Test} from "forge-std/Test.sol";

import {VerifierRollupHelperMock} from "@RealityETH/zkevm-contracts/contracts/mocks/VerifierRollupHelperMock.sol";
import {IRealityETH} from "../contracts/lib/reality-eth/interfaces/IRealityETH.sol";
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import {ForkableRealityETH_ERC20} from "../contracts/ForkableRealityETH_ERC20.sol";
import {RealityETH_v3_0} from "../contracts/lib/reality-eth/RealityETH-3.0.sol";
import {AdjudicationFramework} from "../contracts/AdjudicationFramework.sol";

import {IForkableStructure} from "../contracts/interfaces/IForkableStructure.sol";
import {L1GlobalChainInfoPublisher} from "../contracts/L1GlobalChainInfoPublisher.sol";
import {L2ChainInfo} from "../contracts/L2ChainInfo.sol";
Expand Down

0 comments on commit 738f131

Please sign in to comment.