fix: code cleanup

Author: SgtPooki

src/core/payments/funding.ts

@@ -165,10 +165,10 @@ export function calculateFilecoinPayFundingPlan(options: FilecoinPayFundingPlanO
     throw new Error('pricePerTiBPerEpoch is required when pieceSizeBytes is provided')
   }
 
-  let delta = 0n
+  let delta: bigint
   let projectedDeposit = status.filecoinPayBalance
   let projectedRateUsed = status.currentAllowances.rateUsed ?? 0n
-  let projectedLockupUsed = status.currentAllowances.lockupUsed ?? 0n
+  let projectedLockupUsed: bigint
   let resolvedTargetDeposit: bigint | undefined
   let reasonCode: FundingReasonCode = 'none'
   const targetType = targetRunwayDays != null ? 'runway-days' : 'deposit'
@@ -275,13 +275,13 @@ export function calculateFilecoinPayFundingPlan(options: FilecoinPayFundingPlanO
  */
 export interface PlanFilecoinPayFundingOptions {
   synapse: Synapse
-  targetRunwayDays?: number
-  targetDeposit?: bigint
-  pieceSizeBytes?: number
-  pricePerTiBPerEpoch?: bigint
-  mode?: FundingMode
-  allowWithdraw?: boolean
-  ensureAllowances?: boolean
+  targetRunwayDays?: number | undefined
+  targetDeposit?: bigint | undefined
+  pieceSizeBytes?: number | undefined
+  pricePerTiBPerEpoch?: bigint | undefined
+  mode?: FundingMode | undefined
+  allowWithdraw?: boolean | undefined
+  ensureAllowances?: boolean | undefined
 }
 
 /**
@@ -374,6 +374,17 @@ export async function planFilecoinPayFunding(options: PlanFilecoinPayFundingOpti
   }
 }
 
+/**
+ * Execute a Filecoin Pay funding plan by depositing or withdrawing USDFC.
+ *
+ * - No-op when `plan.delta` is 0 (returns projected insights unchanged).
+ * - Deposits when delta > 0, withdraws when delta < 0.
+ * - Returns updated balances/runway after execution.
+ *
+ * @param synapse - Initialized Synapse instance
+ * @param plan - Funding plan produced by calculate/plan helpers
+ * @returns Execution result with transaction hash (if any) and updated insights
+ */
 export async function executeFilecoinPayFunding(
   synapse: Synapse,
   plan: FilecoinPayFundingPlan

src/payments/fund.ts

@@ -231,8 +231,8 @@ export async function runFund(options: FundOptions): Promise<void> {
     spinner.start('Calculating funding plan...')
     const planResult = await planFilecoinPayFunding({
       synapse,
-      targetRunwayDays: targetDays,
-      targetDeposit,
+      targetRunwayDays: hasDays ? targetDays : undefined,
+      targetDeposit: hasAmount ? targetDeposit : undefined,
       mode: options.mode ?? 'exact',
       allowWithdraw: options.mode !== 'minimum',
     })
@@ -314,7 +314,7 @@ export async function runFund(options: FundOptions): Promise<void> {
       spinner.stop()
       console.error(
         pc.red(
-          `✗ Insufficient USDFC in wallet (need ${formatUSDFC(plan.delta)} USDFC, have ${formatUSDFC(plan.delta - plan.walletShortfall)} USDFC)`
+          `✗ Insufficient USDFC in wallet (need ${formatUSDFC(plan.delta)} USDFC, have ${formatUSDFC(planResult.status.walletUsdfcBalance)} USDFC)`
         )
       )
       cancel('Fund adjustment aborted')

src/test/unit/payments-funding.test.ts

@@ -140,6 +140,60 @@ describe('planFilecoinPayFunding', () => {
     expect(plan.current.runway.state).toBe('no-spend')
     expect(plan.projected.runway.state).toBe('no-spend')
   })
+
+  it('throws when both runway and deposit targets are provided', async () => {
+    const status = makeStatus({ filecoinPayBalance: 0n, wallet: 1_000n })
+    vi.spyOn(paymentsIndex, 'getPaymentStatus').mockResolvedValue(status)
+    vi.spyOn(paymentsIndex, 'checkAndSetAllowances').mockResolvedValue({
+      updated: false,
+      currentAllowances: status.currentAllowances,
+    })
+    vi.spyOn(paymentsIndex, 'validatePaymentRequirements').mockReturnValue({ isValid: true })
+
+    await expect(
+      planFilecoinPayFunding({
+        synapse: synapseStub as any,
+        targetRunwayDays: 10,
+        targetDeposit: 1_000n,
+      })
+    ).rejects.toThrow('Specify either targetRunwayDays or targetDeposit, not both')
+  })
+
+  it('throws when no target is provided', async () => {
+    const status = makeStatus({ filecoinPayBalance: 0n, wallet: 1_000n })
+    vi.spyOn(paymentsIndex, 'getPaymentStatus').mockResolvedValue(status)
+    vi.spyOn(paymentsIndex, 'checkAndSetAllowances').mockResolvedValue({
+      updated: false,
+      currentAllowances: status.currentAllowances,
+    })
+    vi.spyOn(paymentsIndex, 'validatePaymentRequirements').mockReturnValue({ isValid: true })
+
+    await expect(
+      planFilecoinPayFunding({
+        synapse: synapseStub as any,
+      })
+    ).rejects.toThrow('A funding target is required')
+  })
+
+  it('fetches pricing when pieceSizeBytes is provided without pricePerTiBPerEpoch', async () => {
+    const status = makeStatus({ filecoinPayBalance: 0n, wallet: 1_000n })
+    vi.spyOn(paymentsIndex, 'getPaymentStatus').mockResolvedValue(status)
+    vi.spyOn(paymentsIndex, 'checkAndSetAllowances').mockResolvedValue({
+      updated: false,
+      currentAllowances: status.currentAllowances,
+    })
+    vi.spyOn(paymentsIndex, 'validatePaymentRequirements').mockReturnValue({ isValid: true })
+
+    const { plan } = await planFilecoinPayFunding({
+      synapse: synapseStub as any,
+      targetRunwayDays: 10,
+      pieceSizeBytes: 1024,
+    })
+
+    expect(plan.pricePerTiBPerEpoch).toBe(1n)
+    expect(plan.delta).toBeGreaterThan(0n)
+    expect(plan.reasonCode).toBe('runway-with-piece')
+  })
 })
 
 describe('executeFilecoinPayFunding', () => {