post rebase wip

Author: ZenGround0

src/test/unit/payments.compute.test.ts

@@ -163,15 +163,9 @@ describe('computeAdjustmentForExactDaysWithPiece', () => {
   it('adds file requirements to existing usage', () => {
     // Scenario: Existing storage, adding another file
     const rateUsed = 1_000_000_000_000_000_000n // 1 USDFC/epoch
-<<<<<<< HEAD
-    const lockupUsed = rateUsed * BigInt(10) * TIME_CONSTANTS.EPOCHS_PER_DAY // 10 days worth
+    const lockupUsed = rateUsed * BigInt(30) * TIME_CONSTANTS.EPOCHS_PER_DAY // 30 days worth
     const filecoinPayBalance = (lockupUsed * 12n) / 10n // 20% buffer
     const status = makeStatus({ filecoinPayBalance, lockupUsed, rateUsed })
-=======
-    const lockupUsed = rateUsed * BigInt(30) * TIME_CONSTANTS.EPOCHS_PER_DAY // 30 days worth
-    const depositedAmount = (lockupUsed * 12n) / 10n // 20% buffer
-    const status = makeStatus({ depositedAmount, lockupUsed, rateUsed })
->>>>>>> 1b0898e (10 day grace period => 30 day grace period)
 
     const pieceSizeBytes = 1024 * 1024 * 1024 // 1 GiB
     const pricePerTiBPerEpoch = 1_000_000_000_000_000n // 0.001 USDFC per TiB per epoch