Fix merge conflict

This commit is contained in:
Mononaut committed 2024-07-20 12:08:52 +00:00
1 parent 79eb9635c2
commit 9aac0ddce7
4 files changed
+4 -4

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
import { Ancestor, CpfpCluster, CpfpInfo, CpfpSummary, MempoolTransactionExtended, TransactionExtended } from '../mempool.interfaces';
import { GraphTx, convertToGraphTx, expandRelativesGraph, initializeRelatives, makeBlockTemplate, mempoolComparator, removeAncestors, setAncestorScores } from './mini-miner';
import memPool from './mempool';
import { Acceleration } from './acceleration';
import { Acceleration } from './acceleration/acceleration';
const CPFP_UPDATE_INTERVAL = 60_000; // update CPFP info at most once per 60s per transaction
const MAX_CLUSTER_ITERATIONS = 100;
+1 -1
View File
@@ -1,4 +1,4 @@
import { Acceleration } from './acceleration';
import { Acceleration } from './acceleration/acceleration';
import { MempoolTransactionExtended } from '../mempool.interfaces';
import logger from '../logger';