Skip to content

Commit 6882ba1

Browse files
mmackzmmackz
committed
chore: format
1 parent 965294a commit 6882ba1

File tree

3 files changed

+32
-59
lines changed

3 files changed

+32
-59
lines changed

‎packages/evm/contracts/streaming/StreamingCampaign.sol‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,7 @@ contract StreamingCampaign is Initializable {
8686
endTime = endTime_;
8787

8888
emit CampaignInitialized(
89-
streamingManager_,
90-
budget_,
91-
creator_,
92-
configHash_,
93-
rewardToken_,
94-
totalRewards_,
95-
startTime_,
96-
endTime_
89+
streamingManager_, budget_, creator_, configHash_, rewardToken_, totalRewards_, startTime_, endTime_
9790
);
9891
}
9992

‎packages/evm/contracts/streaming/StreamingManager.sol‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -152,26 +152,10 @@ contract StreamingManager is Ownable {
152152

153153
// Initialize the campaign
154154
StreamingCampaign(campaign).initialize(
155-
address(this),
156-
address(budget),
157-
msg.sender,
158-
configHash,
159-
rewardToken,
160-
netAmount,
161-
startTime,
162-
endTime
155+
address(this), address(budget), msg.sender, configHash, rewardToken, netAmount, startTime, endTime
163156
);
164157

165-
emit CampaignCreated(
166-
campaignId,
167-
configHash,
168-
campaign,
169-
msg.sender,
170-
rewardToken,
171-
netAmount,
172-
startTime,
173-
endTime
174-
);
158+
emit CampaignCreated(campaignId, configHash, campaign, msg.sender, rewardToken, netAmount, startTime, endTime);
175159
}
176160

177161
/// @notice Get a campaign contract by ID

‎packages/evm/test/streaming/StreamingManager.t.sol‎

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ contract StreamingManagerTest is Test {
6464
bytes32 configHash = keccak256("test-config");
6565

6666
vm.prank(CREATOR);
67-
uint256 campaignId = manager.createCampaign(
68-
budget, configHash, address(rewardToken), totalAmount, startTime, endTime
69-
);
67+
uint256 campaignId =
68+
manager.createCampaign(budget, configHash, address(rewardToken), totalAmount, startTime, endTime);
7069

7170
assertEq(campaignId, 1, "Campaign ID should be 1");
7271

@@ -96,9 +95,8 @@ contract StreamingManagerTest is Test {
9695
uint256 feeReceiverBalanceBefore = rewardToken.balanceOf(PROTOCOL_FEE_RECEIVER);
9796

9897
vm.prank(CREATOR);
99-
uint256 campaignId = manager.createCampaign(
100-
budget, configHash, address(rewardToken), totalAmount, startTime, endTime
101-
);
98+
uint256 campaignId =
99+
manager.createCampaign(budget, configHash, address(rewardToken), totalAmount, startTime, endTime);
102100

103101
address campaignAddr = manager.getCampaign(campaignId);
104102

@@ -136,9 +134,8 @@ contract StreamingManagerTest is Test {
136134
uint256 feeReceiverBalanceBefore = rewardToken.balanceOf(PROTOCOL_FEE_RECEIVER);
137135

138136
vm.prank(CREATOR);
139-
uint256 campaignId = zeroFeeManager.createCampaign(
140-
budget, configHash, address(rewardToken), totalAmount, startTime, endTime
141-
);
137+
uint256 campaignId =
138+
zeroFeeManager.createCampaign(budget, configHash, address(rewardToken), totalAmount, startTime, endTime);
142139

143140
address campaignAddr = zeroFeeManager.getCampaign(campaignId);
144141

@@ -212,9 +209,8 @@ contract StreamingManagerTest is Test {
212209
uint256 feeReceiverBalanceBefore = rewardToken.balanceOf(PROTOCOL_FEE_RECEIVER);
213210

214211
vm.prank(CREATOR);
215-
uint256 campaignId = maxFeeManager.createCampaign(
216-
budget, configHash, address(rewardToken), totalAmount, startTime, endTime
217-
);
212+
uint256 campaignId =
213+
maxFeeManager.createCampaign(budget, configHash, address(rewardToken), totalAmount, startTime, endTime);
218214

219215
address campaignAddr = maxFeeManager.getCampaign(campaignId);
220216
StreamingCampaign campaign = StreamingCampaign(campaignAddr);
@@ -246,9 +242,7 @@ contract StreamingManagerTest is Test {
246242

247243
vm.prank(unauthorized);
248244
vm.expectRevert(StreamingManager.NotAuthorizedOnBudget.selector);
249-
manager.createCampaign(
250-
budget, keccak256("test"), address(rewardToken), 10 ether, startTime, endTime
251-
);
245+
manager.createCampaign(budget, keccak256("test"), address(rewardToken), 10 ether, startTime, endTime);
252246
}
253247

254248
function test_CreateCampaign_RevertStartTimeInPast() public {
@@ -257,9 +251,7 @@ contract StreamingManagerTest is Test {
257251

258252
vm.prank(CREATOR);
259253
vm.expectRevert(StreamingManager.StartTimeInPast.selector);
260-
manager.createCampaign(
261-
budget, keccak256("test"), address(rewardToken), 10 ether, startTime, endTime
262-
);
254+
manager.createCampaign(budget, keccak256("test"), address(rewardToken), 10 ether, startTime, endTime);
263255
}
264256

265257
function test_CreateCampaign_RevertEndBeforeStart() public {
@@ -268,9 +260,7 @@ contract StreamingManagerTest is Test {
268260

269261
vm.prank(CREATOR);
270262
vm.expectRevert(StreamingManager.EndTimeBeforeStart.selector);
271-
manager.createCampaign(
272-
budget, keccak256("test"), address(rewardToken), 10 ether, startTime, endTime
273-
);
263+
manager.createCampaign(budget, keccak256("test"), address(rewardToken), 10 ether, startTime, endTime);
274264
}
275265

276266
function test_CreateCampaign_RevertZeroAmount() public {
@@ -300,11 +290,11 @@ contract StreamingManagerTest is Test {
300290
// - Net rewards = 900 ether -> fails with InsufficientFunds
301291
vm.prank(CREATOR);
302292
vm.expectRevert(
303-
abi.encodeWithSelector(ABudget.InsufficientFunds.selector, address(rewardToken), uint256(0), uint256(900 ether))
304-
);
305-
manager.createCampaign(
306-
budget, keccak256("test"), address(rewardToken), 1000 ether, startTime, endTime
293+
abi.encodeWithSelector(
294+
ABudget.InsufficientFunds.selector, address(rewardToken), uint256(0), uint256(900 ether)
295+
)
307296
);
297+
manager.createCampaign(budget, keccak256("test"), address(rewardToken), 1000 ether, startTime, endTime);
308298
}
309299

310300
////////////////////////////////
@@ -317,17 +307,23 @@ contract StreamingManagerTest is Test {
317307
uint64 endTime = uint64(block.timestamp + 30 days);
318308

319309
vm.prank(CREATOR);
320-
uint256 campaignId = manager.createCampaign(
321-
budget, keccak256("test"), address(rewardToken), 10 ether, startTime, endTime
322-
);
310+
uint256 campaignId =
311+
manager.createCampaign(budget, keccak256("test"), address(rewardToken), 10 ether, startTime, endTime);
323312

324313
address campaignAddr = manager.getCampaign(campaignId);
325314
StreamingCampaign campaign = StreamingCampaign(campaignAddr);
326315

327316
// Try to initialize again
328317
vm.expectRevert(); // Initializable: already initialized
329318
campaign.initialize(
330-
address(manager), address(budget), CREATOR, keccak256("test"), address(rewardToken), 9 ether, startTime, endTime
319+
address(manager),
320+
address(budget),
321+
CREATOR,
322+
keccak256("test"),
323+
address(rewardToken),
324+
9 ether,
325+
startTime,
326+
endTime
331327
);
332328
}
333329

@@ -352,9 +348,8 @@ contract StreamingManagerTest is Test {
352348
uint64 endTime = uint64(block.timestamp + 30 days);
353349

354350
vm.prank(CREATOR);
355-
uint256 campaignId = manager.createCampaign(
356-
budget, keccak256("test"), address(rewardToken), 10 ether, startTime, endTime
357-
);
351+
uint256 campaignId =
352+
manager.createCampaign(budget, keccak256("test"), address(rewardToken), 10 ether, startTime, endTime);
358353

359354
StreamingCampaign campaign = StreamingCampaign(manager.getCampaign(campaignId));
360355

@@ -376,7 +371,8 @@ contract StreamingManagerTest is Test {
376371
// Check that CampaignInitialized event was emitted
377372
Vm.Log[] memory logs = vm.getRecordedLogs();
378373
bool foundEvent = false;
379-
bytes32 eventSig = keccak256("CampaignInitialized(address,address,address,bytes32,address,uint256,uint64,uint64)");
374+
bytes32 eventSig =
375+
keccak256("CampaignInitialized(address,address,address,bytes32,address,uint256,uint64,uint64)");
380376

381377
for (uint256 i = 0; i < logs.length; i++) {
382378
if (logs[i].topics[0] == eventSig) {

0 commit comments

Comments
 (0)