Skip to content

Commit

Permalink
fix: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
snreynolds committed Sep 5, 2024
2 parents b29c5fe + a0ef70d commit ca8aea7
Show file tree
Hide file tree
Showing 140 changed files with 1,018 additions and 494 deletions.
2 changes: 1 addition & 1 deletion .forge-snapshots/BaseActionsRouter_mock10commands.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
61749
59216
Original file line number Diff line number Diff line change
@@ -1 +1 @@
133206
129308
Original file line number Diff line number Diff line change
@@ -1 +1 @@
135242
131226
Original file line number Diff line number Diff line change
@@ -1 +1 @@
127716
123461
Original file line number Diff line number Diff line change
@@ -1 +1 @@
127854
123603
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_empty.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
49976
50179
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_empty_native.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
49976
50179
Original file line number Diff line number Diff line change
@@ -1 +1 @@
126229
125084
Original file line number Diff line number Diff line change
@@ -1 +1 @@
125727
124645
Original file line number Diff line number Diff line change
@@ -1 +1 @@
133125
131935
Original file line number Diff line number Diff line change
@@ -1 +1 @@
132623
131496
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_native.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
146373
145670
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_sameRange.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
154993
154233
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_withClose.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
154993
154233
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_withTakePair.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
154377
153696
Original file line number Diff line number Diff line change
@@ -1 +1 @@
112573
111481
Original file line number Diff line number Diff line change
@@ -1 +1 @@
120536
119114
Original file line number Diff line number Diff line change
@@ -1 +1 @@
119920
118577
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decrease_burnEmpty.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
135992
134624
Original file line number Diff line number Diff line change
@@ -1 +1 @@
129096
127773
Original file line number Diff line number Diff line change
@@ -1 +1 @@
133252
131801
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decrease_take_take.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
121069
119690
Original file line number Diff line number Diff line change
@@ -1 +1 @@
159243
158418
Original file line number Diff line number Diff line change
@@ -1 +1 @@
158269
157500
Original file line number Diff line number Diff line change
@@ -1 +1 @@
141271
140248
Original file line number Diff line number Diff line change
@@ -1 +1 @@
137388
136027
Original file line number Diff line number Diff line change
@@ -1 +1 @@
178304
176731
Original file line number Diff line number Diff line change
@@ -1 +1 @@
148260
147413
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_native.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
365659
364076
Original file line number Diff line number Diff line change
@@ -1 +1 @@
374151
372456
Original file line number Diff line number Diff line change
@@ -1 +1 @@
373453
371822
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_onSameTickLower.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
318295
316941
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_onSameTickUpper.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
318937
317611
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_sameRange.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
244519
243180
Original file line number Diff line number Diff line change
@@ -1 +1 @@
419583
418068
Original file line number Diff line number Diff line change
@@ -1 +1 @@
324313
322972
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_withClose.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
420859
419474
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_withSettlePair.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
419999
418674
Original file line number Diff line number Diff line change
@@ -1 +1 @@
465248
463642
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_permit.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
79484
79076
Original file line number Diff line number Diff line change
@@ -1 +1 @@
62372
61976
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_permit_twice.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
45260
44876
1 change: 1 addition & 0 deletions .forge-snapshots/PositionManager_subscribe.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
84348
1 change: 1 addition & 0 deletions .forge-snapshots/PositionManager_unsubscribe.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
59238
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2376
2256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8455
7994
2 changes: 1 addition & 1 deletion .forge-snapshots/StateView_extsload_getLiquidity.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1487
1399
2 changes: 1 addition & 1 deletion .forge-snapshots/StateView_extsload_getPositionInfo.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2905
2826
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1724
1651
2 changes: 1 addition & 1 deletion .forge-snapshots/StateView_extsload_getSlot0.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1584
1446
2 changes: 1 addition & 1 deletion .forge-snapshots/StateView_extsload_getTickBitmap.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1682
1392
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2734
2543
2 changes: 1 addition & 1 deletion .forge-snapshots/StateView_extsload_getTickInfo.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3068
2758
2 changes: 1 addition & 1 deletion .forge-snapshots/StateView_extsload_getTickLiquidity.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1879
1646
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_Bytecode.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8389
6909
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
119501
115155
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
118696
115481
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
127568
124296
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
134398
130014
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn2Hops.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
185939
179022
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
177874
169873
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn3Hops.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
237461
228009
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
229420
218884
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactInputSingle.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
133206
129308
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
118309
114449
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
117482
114744
Original file line number Diff line number Diff line change
@@ -1 +1 @@
125230
121352
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
119508
116502
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
128380
125317
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
133181
129234
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactOut2Hops.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
185325
179066
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
182175
175101
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactOut3Hops.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
237465
228905
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
234339
224964
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
228617
220114
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactOutputSingle.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
131978
128515
Original file line number Diff line number Diff line change
@@ -1 +1 @@
124027
120633
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
118318
115858
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
version: nightly

- name: Run tests
run: forge test -vvv
run: forge test --isolate -vvv
env:
FOUNDRY_PROFILE: ci
FORGE_SNAPSHOT_CHECK: true
Loading

0 comments on commit ca8aea7

Please sign in to comment.