Skip to content

Commit c3b1e93

Browse files
committed
Solidity lint
1 parent 7baf457 commit c3b1e93

File tree

4 files changed

+17
-24
lines changed

4 files changed

+17
-24
lines changed

contracts/feeds/balancerv2/OverlayV1BalancerV2Factory.sol

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ contract OverlayV1BalancerV2Factory is OverlayV1FeedFactory {
5252
);
5353

5454
BalancerV2PoolInfo.Pool memory balancerV2Pool = BalancerV2PoolInfo.Pool(
55-
marketPool,
56-
ovlWethPool,
57-
ovl,
58-
marketBaseToken,
59-
marketQuoteToken,
60-
marketBaseAmount
55+
marketPool,
56+
ovlWethPool,
57+
ovl,
58+
marketBaseToken,
59+
marketQuoteToken,
60+
marketBaseAmount
6161
);
6262

6363
// Use the CREATE2 opcode to deploy a new Feed contract.
@@ -69,12 +69,7 @@ contract OverlayV1BalancerV2Factory is OverlayV1FeedFactory {
6969
salt: keccak256(
7070
abi.encode(marketPool, marketBaseToken, marketQuoteToken, marketBaseAmount)
7171
)
72-
}(
73-
balancerV2Pool,
74-
balancerV2Tokens,
75-
microWindow,
76-
macroWindow
77-
)
72+
}(balancerV2Pool, balancerV2Tokens, microWindow, macroWindow)
7873
);
7974

8075
// store feed registry record for (marketPool, marketBaseToken, marketQuoteToken) combo

contracts/feeds/balancerv2/OverlayV1BalancerV2Feed.sol

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,19 @@ contract OverlayV1BalancerV2Feed is OverlayV1Feed {
3232
uint256 _microWindow,
3333
uint256 _macroWindow
3434
) OverlayV1Feed(_microWindow, _macroWindow) {
35-
3635
VAULT = balancerV2Tokens.vault;
3736
// Check if gas cost is reduced by storing vault in memory
3837
IBalancerV2Vault vault = IBalancerV2Vault(balancerV2Tokens.vault);
3938
(IERC20[] memory marketTokens, , ) = getPoolTokensData(balancerV2Tokens.marketPoolId);
4039

4140
require(
42-
getPoolId(balancerV2Pool.marketPool) == balancerV2Tokens.marketPoolId,
43-
"OVLV1Feed: marketPoolId mismatch"
41+
getPoolId(balancerV2Pool.marketPool) == balancerV2Tokens.marketPoolId,
42+
"OVLV1Feed: marketPoolId mismatch"
4443
);
4544

4645
require(
47-
getPoolId(balancerV2Pool.ovlWethPool) == balancerV2Tokens.ovlWethPoolId,
48-
"OVLV1Feed: ovlWethPoolId mismatch"
46+
getPoolId(balancerV2Pool.ovlWethPool) == balancerV2Tokens.ovlWethPoolId,
47+
"OVLV1Feed: ovlWethPoolId mismatch"
4948
);
5049

5150
// TODO: verify token ordering
@@ -58,11 +57,13 @@ contract OverlayV1BalancerV2Feed is OverlayV1Feed {
5857
marketToken1 = _marketToken1;
5958

6059
require(
61-
_marketToken0 == balancerV2Pool.marketBaseToken || _marketToken1 == balancerV2Pool.marketBaseToken,
60+
_marketToken0 == balancerV2Pool.marketBaseToken ||
61+
_marketToken1 == balancerV2Pool.marketBaseToken,
6262
"OVLV1Feed: marketToken != marketBaseToken"
6363
);
6464
require(
65-
_marketToken0 == balancerV2Pool.marketQuoteToken || _marketToken1 == balancerV2Pool.marketQuoteToken,
65+
_marketToken0 == balancerV2Pool.marketQuoteToken ||
66+
_marketToken1 == balancerV2Pool.marketQuoteToken,
6667
"OVLV1Feed: marketToken != marketQuoteToken"
6768
);
6869

@@ -107,7 +108,7 @@ contract OverlayV1BalancerV2Feed is OverlayV1Feed {
107108
}
108109

109110
function getPoolId(address pool) public view returns (bytes32) {
110-
return IBalancerV2Pool(pool).getPoolId();
111+
return IBalancerV2Pool(pool).getPoolId();
111112
}
112113

113114
function _fetch() internal view virtual override returns (Oracle.Data memory) {

contracts/interfaces/feeds/balancerv2/IBalancerV2Pool.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
pragma solidity 0.8.10;
1616
pragma experimental ABIEncoderV2;
1717

18-
1918
interface IBalancerV2Pool {
20-
function getPoolId() external view returns (bytes32);
19+
function getPoolId() external view returns (bytes32);
2120
}
22-

contracts/libraries/balancerv2/BalancerV2PoolInfo.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ library BalancerV2PoolInfo {
1111
uint128 marketBaseAmount;
1212
}
1313
}
14-

0 commit comments

Comments
 (0)