rebase fix
This commit is contained in:
parent
856b374a6d
commit
edf7955a23
1 changed files with 0 additions and 4 deletions
|
|
@ -76,11 +76,7 @@ pub async fn update_mempool(
|
|||
db::cauldron::mempool::load_mempool(&db.cauldron_w).await?;
|
||||
|
||||
let electrum_clone = electrum.clone();
|
||||
<<<<<<< HEAD
|
||||
let (defi_txs, oracle_txs) = tokio::task::spawn_blocking(move || {
|
||||
=======
|
||||
let (cauldron_txs, oracle_txs, ido_txs) = tokio::task::spawn_blocking(move || {
|
||||
>>>>>>> 7fb15f6 (ido: index unconfirmed txs from the mempool)
|
||||
electrum_fetch_mempool(&electrum_clone.lock().unwrap())
|
||||
})
|
||||
.await??;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue