fix audit replication merge conflicts
This commit is contained in:
		
							parent
							
								
									bccc6b3680
								
							
						
					
					
						commit
						e59a9d38ff
					
				@ -37,7 +37,7 @@ class AuditReplication {
 | 
				
			|||||||
    let loggerTimer = Date.now();
 | 
					    let loggerTimer = Date.now();
 | 
				
			||||||
    // process missing audits in batches of 
 | 
					    // process missing audits in batches of 
 | 
				
			||||||
    for (let i = 0; i < missingAudits.length; i += BATCH_SIZE) {
 | 
					    for (let i = 0; i < missingAudits.length; i += BATCH_SIZE) {
 | 
				
			||||||
      const slice = missingAudits.slice(i * BATCH_SIZE, (i + 1) * BATCH_SIZE);
 | 
					      const slice = missingAudits.slice(i, i + BATCH_SIZE);
 | 
				
			||||||
      const results = await Promise.all(slice.map(hash => this.$syncAudit(hash)));
 | 
					      const results = await Promise.all(slice.map(hash => this.$syncAudit(hash)));
 | 
				
			||||||
      const synced = results.reduce((total, status) => status ? total + 1 : total, 0);
 | 
					      const synced = results.reduce((total, status) => status ? total + 1 : total, 0);
 | 
				
			||||||
      totalSynced += synced;
 | 
					      totalSynced += synced;
 | 
				
			||||||
@ -114,6 +114,7 @@ class AuditReplication {
 | 
				
			|||||||
      addedTxs: auditSummary.addedTxs || [],
 | 
					      addedTxs: auditSummary.addedTxs || [],
 | 
				
			||||||
      freshTxs: auditSummary.freshTxs || [],
 | 
					      freshTxs: auditSummary.freshTxs || [],
 | 
				
			||||||
      sigopTxs: auditSummary.sigopTxs || [],
 | 
					      sigopTxs: auditSummary.sigopTxs || [],
 | 
				
			||||||
 | 
					      fullrbfTxs: auditSummary.fullrbfTxs || [],
 | 
				
			||||||
      matchRate: auditSummary.matchRate,
 | 
					      matchRate: auditSummary.matchRate,
 | 
				
			||||||
      expectedFees: auditSummary.expectedFees,
 | 
					      expectedFees: auditSummary.expectedFees,
 | 
				
			||||||
      expectedWeight: auditSummary.expectedWeight,
 | 
					      expectedWeight: auditSummary.expectedWeight,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user