Skip to content

Commit 475fb22

Browse files
shafu0xshafu0x
authored
Merge pull request #101 from Merit-Systems/shafu/rename-to-type
rename type to _type
2 parents 7bc45bf + 97eef1d commit 475fb22

File tree

4 files changed

+46
-48
lines changed

4 files changed

+46
-48
lines changed

‎src/Escrow.sol‎

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ contract Escrow is Owned, IEscrow {
4141
uint amount;
4242
ERC20 token;
4343
address recipient;
44-
uint claimDeadline; // unix seconds
45-
DistributionStatus distributionStatus; // Distributed → Claimed / Reclaimed
46-
DistributionType distributionType; // Repo or Solo
44+
uint claimDeadline; // unix seconds
45+
DistributionStatus status; // Distributed → Claimed / Reclaimed
46+
DistributionType _type; // Repo or Solo
4747
address payer;
48-
uint fee; // fee rate at creation time (basis points)
48+
uint fee; // fee rate at creation time (basis points)
4949
bool exists;
5050
}
5151

@@ -278,7 +278,7 @@ contract Escrow is Owned, IEscrow {
278278
///
279279
function _createDistribution(
280280
DistributionParams calldata distribution,
281-
DistributionType distributionType
281+
DistributionType _type
282282
)
283283
internal
284284
returns (uint distributionId)
@@ -292,20 +292,18 @@ contract Escrow is Owned, IEscrow {
292292
uint feeAmount = distribution.amount.mulDivUp(fee, 10_000);
293293
require(distribution.amount > feeAmount, Errors.INVALID_AMOUNT);
294294

295-
uint claimDeadline = block.timestamp + distribution.claimPeriod;
296-
297295
distributionId = distributionCount++;
298296

299297
distributions[distributionId] = Distribution({
300-
amount: distribution.amount,
301-
token: distribution.token,
302-
recipient: distribution.recipient,
303-
claimDeadline: claimDeadline,
304-
distributionStatus: DistributionStatus.Distributed,
305-
exists: true,
306-
distributionType: distributionType,
307-
payer: distributionType == DistributionType.Solo ? msg.sender : address(0),
308-
fee: fee
298+
amount: distribution.amount,
299+
token: distribution.token,
300+
recipient: distribution.recipient,
301+
claimDeadline: block.timestamp + distribution.claimPeriod,
302+
status: DistributionStatus.Distributed,
303+
exists: true,
304+
_type: _type,
305+
payer: _type == DistributionType.Solo ? msg.sender : address(0),
306+
fee: fee
309307
});
310308
}
311309

@@ -344,12 +342,12 @@ contract Escrow is Owned, IEscrow {
344342
uint distributionId = distributionIds[i];
345343
Distribution storage distribution = distributions[distributionId];
346344

347-
require(distribution.exists, Errors.INVALID_DISTRIBUTION_ID);
348-
require(distribution.distributionStatus == DistributionStatus.Distributed, Errors.ALREADY_CLAIMED);
349-
require(distribution.recipient == msg.sender, Errors.INVALID_RECIPIENT);
350-
require(block.timestamp <= distribution.claimDeadline, Errors.CLAIM_DEADLINE_PASSED);
345+
require(distribution.exists, Errors.INVALID_DISTRIBUTION_ID);
346+
require(distribution.status == DistributionStatus.Distributed, Errors.ALREADY_CLAIMED);
347+
require(distribution.recipient == msg.sender, Errors.INVALID_RECIPIENT);
348+
require(block.timestamp <= distribution.claimDeadline, Errors.CLAIM_DEADLINE_PASSED);
351349

352-
distribution.distributionStatus = DistributionStatus.Claimed;
350+
distribution.status = DistributionStatus.Claimed;
353351

354352
uint feeAmount = distribution.amount.mulDivUp(distribution.fee, 10_000);
355353
// Cap fee to ensure recipient gets at least 1 wei
@@ -401,12 +399,12 @@ contract Escrow is Owned, IEscrow {
401399
uint distributionId = distributionIds[i];
402400
Distribution storage distribution = distributions[distributionId];
403401

404-
require(distribution.exists, Errors.INVALID_DISTRIBUTION_ID);
405-
require(distribution.distributionType == DistributionType.Repo, Errors.NOT_REPO_DISTRIBUTION);
406-
require(distribution.distributionStatus == DistributionStatus.Distributed, Errors.ALREADY_CLAIMED);
407-
require(block.timestamp > distribution.claimDeadline, Errors.STILL_CLAIMABLE);
402+
require(distribution.exists, Errors.INVALID_DISTRIBUTION_ID);
403+
require(distribution._type == DistributionType.Repo, Errors.NOT_REPO_DISTRIBUTION);
404+
require(distribution.status == DistributionStatus.Distributed, Errors.ALREADY_CLAIMED);
405+
require(block.timestamp > distribution.claimDeadline, Errors.STILL_CLAIMABLE);
408406

409-
distribution.distributionStatus = DistributionStatus.Reclaimed;
407+
distribution.status = DistributionStatus.Reclaimed;
410408

411409
RepoAccount memory repoAccount = distributionToRepo[distributionId];
412410
accounts[repoAccount.repoId][repoAccount.accountId].balance[address(distribution.token)] += distribution.amount;
@@ -426,12 +424,12 @@ contract Escrow is Owned, IEscrow {
426424
uint distributionId = distributionIds[i];
427425
Distribution storage distribution = distributions[distributionId];
428426

429-
require(distribution.exists, Errors.INVALID_DISTRIBUTION_ID);
430-
require(distribution.distributionType == DistributionType.Solo, Errors.NOT_DIRECT_DISTRIBUTION);
431-
require(distribution.distributionStatus == DistributionStatus.Distributed, Errors.ALREADY_CLAIMED);
432-
require(block.timestamp > distribution.claimDeadline, Errors.STILL_CLAIMABLE);
427+
require(distribution.exists, Errors.INVALID_DISTRIBUTION_ID);
428+
require(distribution._type == DistributionType.Solo, Errors.NOT_DIRECT_DISTRIBUTION);
429+
require(distribution.status == DistributionStatus.Distributed, Errors.ALREADY_CLAIMED);
430+
require(block.timestamp > distribution.claimDeadline, Errors.STILL_CLAIMABLE);
433431

434-
distribution.distributionStatus = DistributionStatus.Reclaimed;
432+
distribution.status = DistributionStatus.Reclaimed;
435433
distribution.token.safeTransfer(distribution.payer, distribution.amount);
436434

437435
emit ReclaimedSolo(distributionId, distribution.payer, distribution.amount);
@@ -605,7 +603,7 @@ contract Escrow is Owned, IEscrow {
605603
returns (RepoAccount memory)
606604
{
607605
require(distributions[distributionId].exists, Errors.INVALID_DISTRIBUTION_ID);
608-
require(distributions[distributionId].distributionType == DistributionType.Repo, Errors.NOT_REPO_DISTRIBUTION);
606+
require(distributions[distributionId]._type == DistributionType.Repo, Errors.NOT_REPO_DISTRIBUTION);
609607
return distributionToRepo[distributionId];
610608
}
611609

@@ -615,7 +613,7 @@ contract Escrow is Owned, IEscrow {
615613
returns (bool)
616614
{
617615
return distributions[distributionId].exists &&
618-
distributions[distributionId].distributionType == DistributionType.Solo;
616+
distributions[distributionId]._type == DistributionType.Solo;
619617
}
620618

621619
function getAllWhitelistedTokens()

‎test/06_Claim.t.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ contract Claim_Test is Base_Test {
136136

137137
// Check distribution status
138138
Escrow.Distribution memory distribution = escrow.getDistribution(distributionId);
139-
assertTrue(uint8(distribution.distributionStatus) == 1); // Claimed
139+
assertTrue(uint8(distribution.status) == 1); // Claimed
140140

141141
// Check nonce was incremented
142142
assertEq(escrow.recipientNonce(recipient), 1);
@@ -174,7 +174,7 @@ contract Claim_Test is Base_Test {
174174
// Check all distributions are marked as claimed
175175
for (uint i = 0; i < 3; i++) {
176176
Escrow.Distribution memory distribution = escrow.getDistribution(distributionIds[i]);
177-
assertTrue(uint8(distribution.distributionStatus) == 1); // Claimed
177+
assertTrue(uint8(distribution.status) == 1); // Claimed
178178
}
179179
}
180180

@@ -401,7 +401,7 @@ contract Claim_Test is Base_Test {
401401
// All should be claimed
402402
for (uint i = 0; i < batchLimit; i++) {
403403
Escrow.Distribution memory distribution = escrow.getDistribution(distributionIds[i]);
404-
assertTrue(uint8(distribution.distributionStatus) == 1); // Claimed
404+
assertTrue(uint8(distribution.status) == 1); // Claimed
405405
}
406406
}
407407

‎test/08_ReclaimRepo.t.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ contract ReclaimRepo_Test is Base_Test {
112112

113113
// Check distribution status
114114
Escrow.Distribution memory distribution = escrow.getDistribution(distributionId);
115-
assertTrue(uint8(distribution.distributionStatus) == 2); // Reclaimed
115+
assertTrue(uint8(distribution.status) == 2); // Reclaimed
116116
}
117117

118118
function test_reclaimRepo_multipleDistributions() public {
@@ -140,8 +140,8 @@ contract ReclaimRepo_Test is Base_Test {
140140
// Check both distributions are reclaimed
141141
Escrow.Distribution memory distribution1 = escrow.getDistribution(distributionId1);
142142
Escrow.Distribution memory distribution2 = escrow.getDistribution(distributionId2);
143-
assertTrue(uint8(distribution1.distributionStatus) == 2); // Reclaimed
144-
assertTrue(uint8(distribution2.distributionStatus) == 2); // Reclaimed
143+
assertTrue(uint8(distribution1.status) == 2); // Reclaimed
144+
assertTrue(uint8(distribution2.status) == 2); // Reclaimed
145145
}
146146

147147
function test_reclaimRepo_anyoneCanReclaim() public {
@@ -162,7 +162,7 @@ contract ReclaimRepo_Test is Base_Test {
162162

163163
// Check distribution was reclaimed
164164
Escrow.Distribution memory distribution = escrow.getDistribution(distributionId);
165-
assertTrue(uint8(distribution.distributionStatus) == 2); // Reclaimed
165+
assertTrue(uint8(distribution.status) == 2); // Reclaimed
166166
}
167167

168168
function test_reclaimRepo_revert_batchLimitExceeded() public {

‎test/09_ReclaimSolo.t.sol‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ contract ReclaimSolo_Test is Base_Test {
120120

121121
// Check distribution status
122122
Escrow.Distribution memory distribution = escrow.getDistribution(distributionId);
123-
assertTrue(uint8(distribution.distributionStatus) == 2); // Reclaimed
123+
assertTrue(uint8(distribution.status) == 2); // Reclaimed
124124
}
125125

126126
function test_reclaimSolo_multipleDistributions() public {
@@ -146,8 +146,8 @@ contract ReclaimSolo_Test is Base_Test {
146146
// Check both distributions are reclaimed
147147
Escrow.Distribution memory distribution1 = escrow.getDistribution(distributionId1);
148148
Escrow.Distribution memory distribution2 = escrow.getDistribution(distributionId2);
149-
assertTrue(uint8(distribution1.distributionStatus) == 2); // Reclaimed
150-
assertTrue(uint8(distribution2.distributionStatus) == 2); // Reclaimed
149+
assertTrue(uint8(distribution1.status) == 2); // Reclaimed
150+
assertTrue(uint8(distribution2.status) == 2); // Reclaimed
151151
}
152152

153153
function test_reclaimSolo_multiplePayers() public {
@@ -233,7 +233,7 @@ contract ReclaimSolo_Test is Base_Test {
233233

234234
// Check distribution was reclaimed
235235
Escrow.Distribution memory distribution = escrow.getDistribution(distributionId);
236-
assertTrue(uint8(distribution.distributionStatus) == 2); // Reclaimed
236+
assertTrue(uint8(distribution.status) == 2); // Reclaimed
237237
}
238238

239239
function test_reclaimSolo_afterPartialClaim() public {
@@ -390,8 +390,8 @@ contract ReclaimSolo_Test is Base_Test {
390390
assertEq(distributionBefore.amount, DISTRIBUTION_AMOUNT);
391391
assertEq(distributionBefore.recipient, recipient);
392392
assertEq(distributionBefore.payer, soloPayer);
393-
assertTrue(uint8(distributionBefore.distributionStatus) == 0); // Distributed
394-
assertTrue(uint8(distributionBefore.distributionType) == 1); // Solo
393+
assertTrue(uint8(distributionBefore.status) == 0); // Distributed
394+
assertTrue(uint8(distributionBefore._type) == 1); // Solo
395395

396396
// Move past claim deadline and reclaim
397397
vm.warp(block.timestamp + CLAIM_PERIOD + 1);
@@ -406,8 +406,8 @@ contract ReclaimSolo_Test is Base_Test {
406406
assertEq(distributionAfter.amount, DISTRIBUTION_AMOUNT);
407407
assertEq(distributionAfter.recipient, recipient);
408408
assertEq(distributionAfter.payer, soloPayer);
409-
assertTrue(uint8(distributionAfter.distributionStatus) == 2); // Reclaimed
410-
assertTrue(uint8(distributionAfter.distributionType) == 1); // Solo
409+
assertTrue(uint8(distributionAfter.status) == 2); // Reclaimed
410+
assertTrue(uint8(distributionAfter._type) == 1); // Solo
411411
}
412412

413413
function test_reclaimSolo_fuzz_amounts(uint256 amount1, uint256 amount2) public {

0 commit comments

Comments
 (0)