Merge pull request #100 from Merit-Systems/shafu/distribute-from-sender

shafu0x · web-flow · commit 95e448d85e86 · 2025-06-12T22:48:11.000+02:00
Rename distributeRepo to distributeFromRepo
diff --git a/src/Escrow.sol b/src/Escrow.sol
@@ -196,7 +196,7 @@ contract Escrow is Owned, IEscrow {
     /* -------------------------------------------------------------------------- */
     /*                              DISTRIBUTE REPO / SOLO                        */
     /* -------------------------------------------------------------------------- */
-    function distributeRepo(
+    function distributeFromRepo(
         uint                          repoId,
         uint                          accountId,
         DistributionParams[] calldata _distributions,
@@ -245,7 +245,7 @@ contract Escrow is Owned, IEscrow {
     }
 
     ///
-    function distributeSolo(
+    function distributeFromSender(
         DistributionParams[] calldata _distributions,
         bytes                calldata data
     ) 
diff --git a/test/04_DistributeFromRepo.t.sol b/test/04_DistributeFromRepo.t.sol
diff --git a/test/05_DistributeFromSender.t.sol b/test/05_DistributeFromSender.t.sol
diff --git a/test/06_Claim.t.sol b/test/06_Claim.t.sol
@@ -65,7 +65,7 @@ contract Claim_Test is Base_Test {
         });
 
         vm.prank(repoAdmin);
-        uint[] memory distributionIds = escrow.distributeRepo(REPO_ID, ACCOUNT_ID, distributions, "");
+        uint[] memory distributionIds = escrow.distributeFromRepo(REPO_ID, ACCOUNT_ID, distributions, "");
         return distributionIds[0];
     }
 
@@ -84,7 +84,7 @@ contract Claim_Test is Base_Test {
         });
 
         vm.prank(payer);
-        uint[] memory distributionIds = escrow.distributeSolo(distributions, "");
+        uint[] memory distributionIds = escrow.distributeFromSender(distributions, "");
         return distributionIds[0];
     }
 
diff --git a/test/07_ReclaimFund.t.sol b/test/07_ReclaimFund.t.sol
@@ -62,7 +62,7 @@ contract ReclaimFund_Test is Base_Test {
         });
 
         vm.prank(repoAdmin);
-        uint[] memory distributionIds = escrow.distributeRepo(REPO_ID, ACCOUNT_ID, distributions, "");
+        uint[] memory distributionIds = escrow.distributeFromRepo(REPO_ID, ACCOUNT_ID, distributions, "");
         return distributionIds[0];
     }
 
diff --git a/test/08_ReclaimRepo.t.sol b/test/08_ReclaimRepo.t.sol
@@ -63,7 +63,7 @@ contract ReclaimRepo_Test is Base_Test {
         });
 
         vm.prank(repoAdmin);
-        uint[] memory distributionIds = escrow.distributeRepo(REPO_ID, ACCOUNT_ID, distributions, "");
+        uint[] memory distributionIds = escrow.distributeFromRepo(REPO_ID, ACCOUNT_ID, distributions, "");
         return distributionIds[0];
     }
 
@@ -82,7 +82,7 @@ contract ReclaimRepo_Test is Base_Test {
         });
 
         vm.prank(soloPayer);
-        uint[] memory distributionIds = escrow.distributeSolo(distributions, "");
+        uint[] memory distributionIds = escrow.distributeFromSender(distributions, "");
         return distributionIds[0];
     }
 
diff --git a/test/09_ReclaimSolo.t.sol b/test/09_ReclaimSolo.t.sol
@@ -75,7 +75,7 @@ contract ReclaimSolo_Test is Base_Test {
         });
 
         vm.prank(payer);
-        uint[] memory distributionIds = escrow.distributeSolo(distributions, "");
+        uint[] memory distributionIds = escrow.distributeFromSender(distributions, "");
         return distributionIds[0];
     }
 
@@ -91,7 +91,7 @@ contract ReclaimSolo_Test is Base_Test {
         });
 
         vm.prank(repoAdmin);
-        uint[] memory distributionIds = escrow.distributeRepo(REPO_ID, ACCOUNT_ID, distributions, "");
+        uint[] memory distributionIds = escrow.distributeFromRepo(REPO_ID, ACCOUNT_ID, distributions, "");
         return distributionIds[0];
     }
 
diff --git a/test/10_OnlyOwner.t.sol b/test/10_OnlyOwner.t.sol
@@ -520,7 +520,7 @@ contract OnlyOwner_Test is Base_Test {
         });
 
         vm.prank(admin);
-        escrow.distributeRepo(repoId, accountId, distributions, "");
+        escrow.distributeFromRepo(repoId, accountId, distributions, "");
     }
 
     function _createSingleDistribution(address recipient, uint256 amount) internal {
@@ -536,7 +536,7 @@ contract OnlyOwner_Test is Base_Test {
             token: wETH
         });
 
-        escrow.distributeSolo(distributions, "");
+        escrow.distributeFromSender(distributions, "");
     }
 
     function _verifyDistributionFeesUnchanged(uint256 expectedFee) internal view {

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ contract Claim_Test is Base_Test {`
`65`	`65`	`});`
`66`	`66`
`67`	`67`	`vm.prank(repoAdmin);`
`68`		`- uint[] memory distributionIds = escrow.distributeRepo(REPO_ID, ACCOUNT_ID, distributions, "");`
	`68`	`+ uint[] memory distributionIds = escrow.distributeFromRepo(REPO_ID, ACCOUNT_ID, distributions, "");`
`69`	`69`	`return distributionIds[0];`
`70`	`70`	`}`
`71`	`71`
`@@ -84,7 +84,7 @@ contract Claim_Test is Base_Test {`
`84`	`84`	`});`
`85`	`85`
`86`	`86`	`vm.prank(payer);`
`87`		`- uint[] memory distributionIds = escrow.distributeSolo(distributions, "");`
	`87`	`+ uint[] memory distributionIds = escrow.distributeFromSender(distributions, "");`
`88`	`88`	`return distributionIds[0];`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ contract ReclaimFund_Test is Base_Test {`
`62`	`62`	`});`
`63`	`63`
`64`	`64`	`vm.prank(repoAdmin);`
`65`		`- uint[] memory distributionIds = escrow.distributeRepo(REPO_ID, ACCOUNT_ID, distributions, "");`
	`65`	`+ uint[] memory distributionIds = escrow.distributeFromRepo(REPO_ID, ACCOUNT_ID, distributions, "");`
`66`	`66`	`return distributionIds[0];`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ contract ReclaimRepo_Test is Base_Test {`
`63`	`63`	`});`
`64`	`64`
`65`	`65`	`vm.prank(repoAdmin);`
`66`		`- uint[] memory distributionIds = escrow.distributeRepo(REPO_ID, ACCOUNT_ID, distributions, "");`
	`66`	`+ uint[] memory distributionIds = escrow.distributeFromRepo(REPO_ID, ACCOUNT_ID, distributions, "");`
`67`	`67`	`return distributionIds[0];`
`68`	`68`	`}`
`69`	`69`
`@@ -82,7 +82,7 @@ contract ReclaimRepo_Test is Base_Test {`
`82`	`82`	`});`
`83`	`83`
`84`	`84`	`vm.prank(soloPayer);`
`85`		`- uint[] memory distributionIds = escrow.distributeSolo(distributions, "");`
	`85`	`+ uint[] memory distributionIds = escrow.distributeFromSender(distributions, "");`
`86`	`86`	`return distributionIds[0];`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ contract ReclaimSolo_Test is Base_Test {`
`75`	`75`	`});`
`76`	`76`
`77`	`77`	`vm.prank(payer);`
`78`		`- uint[] memory distributionIds = escrow.distributeSolo(distributions, "");`
	`78`	`+ uint[] memory distributionIds = escrow.distributeFromSender(distributions, "");`
`79`	`79`	`return distributionIds[0];`
`80`	`80`	`}`
`81`	`81`
`@@ -91,7 +91,7 @@ contract ReclaimSolo_Test is Base_Test {`
`91`	`91`	`});`
`92`	`92`
`93`	`93`	`vm.prank(repoAdmin);`
`94`		`- uint[] memory distributionIds = escrow.distributeRepo(REPO_ID, ACCOUNT_ID, distributions, "");`
	`94`	`+ uint[] memory distributionIds = escrow.distributeFromRepo(REPO_ID, ACCOUNT_ID, distributions, "");`
`95`	`95`	`return distributionIds[0];`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ contract OnlyOwner_Test is Base_Test {`
`520`	`520`	`});`
`521`	`521`
`522`	`522`	`vm.prank(admin);`
`523`		`- escrow.distributeRepo(repoId, accountId, distributions, "");`
	`523`	`+ escrow.distributeFromRepo(repoId, accountId, distributions, "");`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`function _createSingleDistribution(address recipient, uint256 amount) internal {`
`@@ -536,7 +536,7 @@ contract OnlyOwner_Test is Base_Test {`
`536`	`536`	`token: wETH`
`537`	`537`	`});`
`538`	`538`
`539`		`- escrow.distributeSolo(distributions, "");`
	`539`	`+ escrow.distributeFromSender(distributions, "");`
`540`	`540`	`}`
`541`	`541`
`542`	`542`	`function _verifyDistributionFeesUnchanged(uint256 expectedFee) internal view {`