Multi query adjustments (#1732)
This commit is contained in:
@@ -16,7 +16,7 @@ import jsonrpcMethod from '@polkadot/jsonrpc/create/method';
|
||||
import jsonrpcParam from '@polkadot/jsonrpc/create/param';
|
||||
import { Option, StorageKey, Vec, createClass } from '@polkadot/types';
|
||||
import { createTypeUnsafe } from '@polkadot/types/codec';
|
||||
import { assert, isFunction, isNull, isNumber, logger, u8aToU8a } from '@polkadot/util';
|
||||
import { assert, isFunction, isNull, isNumber, isUndefined, logger, u8aToU8a } from '@polkadot/util';
|
||||
|
||||
import { drr } from './rxjs';
|
||||
|
||||
@@ -390,24 +390,19 @@ export default class Rpc implements RpcInterface {
|
||||
const type = key.outputType || 'Raw';
|
||||
const hexKey = key.toHex();
|
||||
const meta = key.meta || EMPTY_META;
|
||||
const found = changes.find(([key]): boolean => key === hexKey);
|
||||
|
||||
// if we don't find the value, this is our fallback
|
||||
// - in the case of an array of values, fill the hole from the cache
|
||||
// - if a single result value, don't fill - it is not an update hole
|
||||
// - fallback to an empty option in all cases
|
||||
const emptyVal = (witCache && this._storageCache.get(hexKey)) || null;
|
||||
|
||||
// see if we have a result value for this specific key, fallback to the cache value
|
||||
// when the value in the set is not available, or is null/empty.
|
||||
const [, value] = changes.find(([key, value]): boolean =>
|
||||
!isNull(value) && key === hexKey
|
||||
) || [null, emptyVal];
|
||||
const value = isUndefined(found)
|
||||
? (witCache && this._storageCache.get(hexKey)) || null
|
||||
: found[1];
|
||||
const isEmpty = isNull(value);
|
||||
const input = isEmpty
|
||||
? null
|
||||
: this.treatAsHex(key)
|
||||
? value
|
||||
: u8aToU8a(value);
|
||||
const input = isEmpty || this.treatAsHex(key)
|
||||
? value
|
||||
: u8aToU8a(value);
|
||||
|
||||
// store the retrieved result - the only issue with this cache is that there is no
|
||||
// clearing of it, so very long running processes (not just a couple of hours, longer)
|
||||
|
||||
Reference in New Issue
Block a user