fix

1inch · Jan 24, 2025 · f6e4737 · f6e4737
1 parent d7177e3
commit f6e4737
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/fusion-order/fusion-order.ts b/src/fusion-order/fusion-order.ts
@@ -370,9 +370,9 @@ export class FusionOrder {
      * */
     public calcTakingAmount(
         taker: Address,
+        makingAmount: bigint,
         time: bigint,
-        blockBaseFee = 0n,
-        makingAmount = this.makingAmount
+        blockBaseFee = 0n
     ): bigint {
         const takingAmount = calcTakingAmount(
             makingAmount,

diff --git a/tests/fusion-order/fusion-order.spec.ts b/tests/fusion-order/fusion-order.spec.ts
@@ -118,6 +118,7 @@ describe('SettlementExtension', () => {
         )
     })
 
+    // eslint-disable-next-line max-lines-per-function
     describe('Fees', () => {
         it('only integrator fee', async () => {
             const integratorAddress = Address.fromBigInt(1337n)
@@ -216,7 +217,12 @@ describe('SettlementExtension', () => {
                 order.makingAmount
             )
             expect(initBalances.usdc.taker - finalBalances.usdc.taker).toBe(
-                order.calcTakingAmount(takerAddress, now(), 0n)
+                order.calcTakingAmount(
+                    takerAddress,
+                    order.makingAmount,
+                    now(),
+                    0n
+                )
             )
 
             expect(
@@ -319,7 +325,12 @@ describe('SettlementExtension', () => {
                 order.makingAmount
             )
             expect(initBalances.usdc.taker - finalBalances.usdc.taker).toBe(
-                order.calcTakingAmount(takerAddress, now(), 0n)
+                order.calcTakingAmount(
+                    takerAddress,
+                    order.makingAmount,
+                    now(),
+                    0n
+                )
             )
 
             expect(
@@ -431,7 +442,12 @@ describe('SettlementExtension', () => {
                 order.makingAmount
             )
             expect(initBalances.usdc.taker - finalBalances.usdc.taker).toBe(
-                order.calcTakingAmount(takerAddress, now(), 0n)
+                order.calcTakingAmount(
+                    takerAddress,
+                    order.makingAmount,
+                    now(),
+                    0n
+                )
             )
 
             expect(
@@ -566,7 +582,12 @@ describe('SettlementExtension', () => {
                 order.makingAmount
             )
             expect(initBalances.usdc.taker - finalBalances.usdc.taker).toBe(
-                order.calcTakingAmount(takerAddress, now(), 0n)
+                order.calcTakingAmount(
+                    takerAddress,
+                    order.makingAmount,
+                    now(),
+                    0n
+                )
             )
 
             expect(