machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix redis feature merge conflicts

Browse Source
This commit is contained in:
Mononaut 2023-06-16 18:55:22 -04:00
parent aea2b1ec6b
commit b6cb539470
No known key found for this signature in database
GPG Key ID: A3F058E41374C04E
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/api/redis-cache.ts
View File

@ -3,7 +3,7 @@ import memPool from './mempool';
import blocks from './blocks'; import blocks from './blocks';
import logger from '../logger'; import logger from '../logger';
import config from '../config'; import config from '../config';
import { BlockExtended, BlockSummary, TransactionExtended } from '../mempool.interfaces'; import { BlockExtended, BlockSummary, MempoolTransactionExtended } from '../mempool.interfaces';
import rbfCache from './rbf-cache'; import rbfCache from './rbf-cache';
class RedisCache { class RedisCache {
@ -52,7 +52,7 @@ class RedisCache {
} }
} }
async $addTransactions(newTransactions: TransactionExtended[]) { async $addTransactions(newTransactions: MempoolTransactionExtended[]) {
try { try {
await this.$ensureConnected(); await this.$ensureConnected();
await Promise.all(newTransactions.map(tx => { await Promise.all(newTransactions.map(tx => {
@ -112,12 +112,12 @@ class RedisCache {
} }
} }
async $getMempool(): Promise<{ [txid: string]: TransactionExtended }> { async $getMempool(): Promise<{ [txid: string]: MempoolTransactionExtended }> {
const mempool = {}; const mempool = {};
try { try {
await this.$ensureConnected(); await this.$ensureConnected();
const keys = await this.client.keys('tx:*'); const keys = await this.client.keys('tx:*');
const promises: Promise<TransactionExtended[]>[] = []; const promises: Promise<MempoolTransactionExtended[]>[] = [];
for (let i = 0; i < keys.length; i += 10000) { for (let i = 0; i < keys.length; i += 10000) {
const keySlice = keys.slice(i, i + 10000); const keySlice = keys.slice(i, i + 10000);
if (!keySlice.length) { if (!keySlice.length) {
@ -144,7 +144,7 @@ class RedisCache {
try { try {
await this.$ensureConnected(); await this.$ensureConnected();
const keys = await this.client.keys(`rbf:${type}:*`); const keys = await this.client.keys(`rbf:${type}:*`);
const promises: Promise<TransactionExtended[]>[] = []; const promises: Promise<MempoolTransactionExtended[]>[] = [];
for (let i = 0; i < keys.length; i += 10000) { for (let i = 0; i < keys.length; i += 10000) {
const keySlice = keys.slice(i, i + 10000); const keySlice = keys.slice(i, i + 10000);
if (!keySlice.length) { if (!keySlice.length) {