Skip to content

Commit 3d3d63c

Browse files
ricklistaclaude
andcommitted
fix: resolve post-rebase compilation breaks
- BrokerLiquidator: drop duplicate receive() — master's d309fdc and the branch each declared an identical receive(); Solidity allows only one. The documented receive() at the end of the contract is kept, so the liquidator can still receive native BNB. - BatchManagementUtils.t.sol: update _deployBroker() to the new LendingBroker 2-arg constructor and 8-arg initialize (RELAYER/ORACLE moved from immutables to storage in 22bb8cf). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 7701280 commit 3d3d63c

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

src/liquidator/BrokerLiquidator.sol

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ contract BrokerLiquidator is UUPSUpgradeable, AccessControlUpgradeable, IBrokerL
8787
_grantRole(BOT, bot);
8888
}
8989

90-
receive() external payable {}
91-
9290
/// @dev withdraws ERC20 tokens.
9391
/// @param token The address of the token.
9492
/// @param amount The amount to withdraw.

test/utils/BatchManagementUtils.t.sol

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,20 @@ contract BatchManagementUtilsTest is Test {
160160
}
161161

162162
function _deployBroker() internal returns (LendingBroker b) {
163-
LendingBroker impl = new LendingBroker(address(moolah), RELAYER_STUB, address(oracle), address(0));
163+
LendingBroker impl = new LendingBroker(address(moolah), address(0));
164164
ERC1967Proxy proxy = new ERC1967Proxy(
165165
address(impl),
166-
abi.encodeWithSelector(LendingBroker.initialize.selector, ADMIN, MANAGER, BOT, PAUSER, address(rateCalc), 10)
166+
abi.encodeWithSelector(
167+
LendingBroker.initialize.selector,
168+
ADMIN,
169+
MANAGER,
170+
BOT,
171+
PAUSER,
172+
address(rateCalc),
173+
10,
174+
RELAYER_STUB,
175+
address(oracle)
176+
)
167177
);
168178
b = LendingBroker(payable(address(proxy)));
169179
}

0 commit comments

Comments
 (0)