fix: Better way to create QueryOptions

nervosnetwork · Dec 3, 2023 · ff4b013 · ff4b013
1 parent daffc24
commit ff4b013
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/connector.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/connector.ts
@@ -165,14 +165,11 @@ export abstract class Connector {
       throw new Error('at least one parameter is required')
     }
 
-    const queries: QueryOptions = {}
-    if (lock) {
-      queries.lock = lock
+    const queries: QueryOptions = {
+      ...(lock ? { lock } : {}),
+      ...(type ? { type } : {}),
+      data: data || 'any',
     }
-    if (type) {
-      queries.type = type
-    }
-    queries.data = data || 'any'
 
     const collector = new CellCollector(this.indexer, queries)
 

diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-connector.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-connector.ts
@@ -1,5 +1,4 @@
 import { Tip } from '@ckb-lumos/base'
-import { Indexer as CkbIndexer } from '@ckb-lumos/ckb-indexer'
 import logger from '../../utils/logger'
 import CommonUtils from '../../utils/common'
 import RpcService from '../../services/rpc-service'
@@ -13,7 +12,6 @@ export default class IndexerConnector extends Connector {
 
   constructor(addresses: Address[], nodeUrl: string, indexerUrl: string, nodeType: NetworkType) {
     super({ addresses, nodeUrl, indexerUrl })
-    this.indexer = new CkbIndexer(nodeUrl, indexerUrl)
     this.rpcService = new RpcService(nodeUrl, nodeType)
   }