Skip to content

Commit 3fd90fb

Browse files
committed
fix unit test; update base integration ci
1 parent 2659187 commit 3fd90fb

File tree

2 files changed

+31
-13
lines changed

2 files changed

+31
-13
lines changed

.github/workflows/base-integration.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Base
1+
name: Base
22

33
on: [pull_request]
44

@@ -121,7 +121,7 @@ jobs:
121121
retry_wait_seconds: 60
122122
timeout_minutes: 20
123123
max_attempts: 3
124-
command: time forge test --match-contract CypherIntegrationTest --fork-url base -vvv
124+
command: time forge test --match-contract CypherIntegrationTest --fork-url base -vvv
125125

126126
bounded-chainlink-composite-oracle:
127127
name: Bounded Chainlink Composite Oracle Test
@@ -147,8 +147,8 @@ jobs:
147147
max_attempts: 3
148148
command: time forge test --mc "ChainlinkBoundedCompositeOracleIntegrationTest" -vvv --ffi
149149

150-
chainlink-oracle-proxy:
151-
name: Chainlink Oracle Proxy Test
150+
chainlink-oev-wrapper:
151+
name: Chainlink OEV Wrapper Test
152152
runs-on: ubuntu-latest
153153
steps:
154154
- name: Checkout code
@@ -166,5 +166,25 @@ jobs:
166166
retry_wait_seconds: 60
167167
timeout_minutes: 20
168168
max_attempts: 3
169-
command: time forge test --mc "ChainlinkOracleProxyIntegrationTest" -vvv --ffi
169+
command: time forge test --mc "ChainlinkOEVWrapperIntegrationTest" -vvv --ffi
170170

171+
chainlink-oev-morpho-wrapper:
172+
name: Chainlink OEV Wrapper Test
173+
runs-on: ubuntu-latest
174+
steps:
175+
- name: Checkout code
176+
uses: actions/checkout@v2
177+
with:
178+
submodules: recursive
179+
180+
- name: Setup Environment
181+
uses: ./.github/actions
182+
183+
- name: Run Integration Tests
184+
uses: nick-fields/retry@v3
185+
with:
186+
polling_interval_seconds: 30
187+
retry_wait_seconds: 60
188+
timeout_minutes: 20
189+
max_attempts: 3
190+
command: time forge test --mc "ChainlinkOEVMorphoWrapperIntegrationTest" -vvv --ffi

test/unit/ChainlinkOEVMorphoWrapperUnit.t.sol

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,13 @@ contract ChainlinkOEVMorphoWrapperUnitTest is Test {
4141
address(implementation),
4242
proxyAdmin,
4343
abi.encodeWithSignature(
44-
"initialize(address,address,address,uint16,uint256,uint256,address)",
44+
"initialize(address,address,address,uint16,uint256,uint256)",
4545
feed,
4646
owner,
4747
feeRecipient,
4848
defaultFeeBps,
4949
defaultMaxRoundDelay,
50-
defaultMaxDecrements,
51-
morphoBlue
50+
defaultMaxDecrements
5251
)
5352
);
5453
proxy = ChainlinkOEVMorphoWrapper(address(proxyContract));
@@ -69,14 +68,13 @@ contract ChainlinkOEVMorphoWrapperUnitTest is Test {
6968
address(implementation),
7069
proxyAdmin,
7170
abi.encodeWithSignature(
72-
"initialize(address,address,address,uint16,uint256,uint256,address)",
71+
"initialize(address,address,address,uint16,uint256,uint256)",
7372
address(mockFeed),
7473
owner,
7574
feeRecipient,
7675
defaultFeeBps,
7776
defaultMaxRoundDelay,
78-
defaultMaxDecrements,
79-
morphoBlue
77+
defaultMaxDecrements
8078
)
8179
);
8280
}
@@ -124,7 +122,7 @@ contract ChainlinkOEVMorphoWrapperUnitTest is Test {
124122

125123
vm.prank(owner);
126124
vm.expectEmit(true, true, false, true, address(proxy));
127-
emit FeeRecipientChanged(address(0), newRecipient);
125+
emit FeeRecipientChanged(feeRecipient, newRecipient);
128126
proxy.setFeeRecipient(newRecipient);
129127

130128
// verify state
@@ -164,7 +162,7 @@ contract ChainlinkOEVMorphoWrapperUnitTest is Test {
164162
uint16 newFee = 250; // 2.5%
165163
vm.prank(owner);
166164
vm.expectEmit(false, false, false, true, address(proxy));
167-
emit FeeMultiplierChanged(0, newFee);
165+
emit FeeMultiplierChanged(defaultFeeBps, newFee);
168166
proxy.setFeeMultiplier(newFee);
169167

170168
assertEq(proxy.feeMultiplier(), newFee, "feeMultiplier not updated");

0 commit comments

Comments
 (0)