Fix merge conflicts

atomex-protocol · Aug 30, 2022 · 88c9007 · 88c9007
1 parent da05f34
commit 88c9007
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/tests/atomex/testCases/swapPreviewWithAccountAndInvolvedSwapsTestCases.ts b/tests/atomex/testCases/swapPreviewWithAccountAndInvolvedSwapsTestCases.ts
@@ -5,7 +5,7 @@ import type { Swap } from '../../../src';
 import type { SwapPreview, SwapPreviewParameters } from '../../../src/atomex/models';
 import type { ExchangeSymbol, OrderBook } from '../../../src/exchange';
 import type { Accounts } from './accounts';
-import { AtomexProtocolV1Fees, validAtomexProtocolV1Fees } from './atomexProtocolFees';
+import { AtomexProtocolMultiChainFees, validAtomexProtocolMultiChainFees } from './atomexProtocolFees';
 import { validExchangeSymbols } from './exchangeSymbols';
 import { validOrderBooks } from './orderBooks';
 
@@ -89,7 +89,7 @@ const swapPreviewWithoutAccountTestCases: ReadonlyArray<[
   environment: {
     symbols: ExchangeSymbol[],
     orderBooks: OrderBook[],
-    atomexProtocolFees: AtomexProtocolV1Fees,
+    atomexProtocolFees: AtomexProtocolMultiChainFees,
     accounts: Accounts,
     swaps: Swap[]
   }
@@ -186,7 +186,7 @@ const swapPreviewWithoutAccountTestCases: ReadonlyArray<[
       {
         symbols: validExchangeSymbols,
         orderBooks: [validOrderBooks['XTZ/ETH'][0]],
-        atomexProtocolFees: validAtomexProtocolV1Fees[0],
+        atomexProtocolFees: validAtomexProtocolMultiChainFees[0],
         accounts: {
           tezos: {
             tz101: {
@@ -296,7 +296,7 @@ const swapPreviewWithoutAccountTestCases: ReadonlyArray<[
       {
         symbols: validExchangeSymbols,
         orderBooks: [validOrderBooks['XTZ/ETH'][0]],
-        atomexProtocolFees: validAtomexProtocolV1Fees[0],
+        atomexProtocolFees: validAtomexProtocolMultiChainFees[0],
         accounts: {
           tezos: {
             tz101: {
@@ -406,7 +406,7 @@ const swapPreviewWithoutAccountTestCases: ReadonlyArray<[
       {
         symbols: validExchangeSymbols,
         orderBooks: [validOrderBooks['XTZ/ETH'][0]],
-        atomexProtocolFees: validAtomexProtocolV1Fees[0],
+        atomexProtocolFees: validAtomexProtocolMultiChainFees[0],
         accounts: {
           tezos: {
             tz101: {