Use Promise.resolve

This commit is contained in:
Chris Clark
2015-10-27 10:39:18 -07:00
parent cd5eedff84
commit 6db2a72eb8
6 changed files with 13 additions and 14 deletions

View File

@@ -106,7 +106,7 @@ class Connection extends EventEmitter {
}
disconnect() {
return new Promise((resolve) => {
return new Promise(resolve => {
if (this.state === WebSocket.CLOSED) {
resolve();
} else if (this.state === WebSocket.CLOSING) {
@@ -140,14 +140,13 @@ class Connection extends EventEmitter {
}
getLedgerVersion() {
return this._whenReady(
new Promise(resolve => resolve(this._ledgerVersion)));
return this._whenReady(Promise.resolve(this._ledgerVersion));
}
hasLedgerVersions(lowLedgerVersion, highLedgerVersion) {
return this._whenReady(new Promise(resolve =>
resolve(this._availableLedgerVersions.containsRange(
lowLedgerVersion, highLedgerVersion || this._ledgerVersion))));
return this._whenReady(Promise.resolve(
this._availableLedgerVersions.containsRange(
lowLedgerVersion, highLedgerVersion || this._ledgerVersion)));
}
hasLedgerVersion(ledgerVersion) {

View File

@@ -43,7 +43,7 @@ function formatBalances(options, balances) {
function getLedgerVersionHelper(connection: Connection, optionValue?: number
): Promise<number> {
if (optionValue !== undefined && optionValue !== null) {
return new Promise(resolve => resolve(optionValue));
return Promise.resolve(optionValue);
}
return connection.getLedgerVersion();
}

View File

@@ -79,7 +79,7 @@ function conditionallyAddDirectXRPPath(connection: Connection, address: string,
): Promise {
if (isRippledIOUAmount(paths.destination_amount)
|| !_.includes(paths.destination_currencies, 'XRP')) {
return new Promise(resolve => resolve(paths));
return Promise.resolve(paths);
}
return utils.getXRPBalance(connection, address, undefined).then(
xrpBalance => addDirectXrpPath(paths, xrpBalance));

View File

@@ -10,7 +10,7 @@ import type {TransactionType, TransactionOptions} from './transaction-types';
function attachTransactionDate(connection: Connection, tx: Object
): Promise<TransactionType> {
if (tx.date) {
return new Promise(resolve => resolve(tx));
return Promise.resolve(tx);
}
if (!tx.ledger_index) {
@@ -64,7 +64,7 @@ function convertError(connection: Connection, options: TransactionOptions,
return _error;
});
}
return new Promise(resolve => resolve(_error));
return Promise.resolve(_error);
}
function formatResponse(options: TransactionOptions, tx: TransactionType

View File

@@ -117,7 +117,7 @@ function ensureLedgerVersion(options: Object
if (Boolean(options) && options.ledgerVersion !== undefined &&
options.ledgerVersion !== null
) {
return new Promise(resolve => resolve(options));
return Promise.resolve(options);
}
return this.getLedgerVersion().then(ledgerVersion =>
_.assign({}, options, {ledgerVersion}));

View File

@@ -37,7 +37,7 @@ function prepareTransaction(txJSON: Object, api: Object,
function prepareMaxLedgerVersion(): Promise<Object> {
if (instructions.maxLedgerVersion !== undefined) {
txJSON.LastLedgerSequence = instructions.maxLedgerVersion;
return new Promise(resolve => resolve(txJSON));
return Promise.resolve(txJSON);
}
const offset = instructions.maxLedgerVersionOffset !== undefined ?
instructions.maxLedgerVersionOffset : 3;
@@ -50,7 +50,7 @@ function prepareTransaction(txJSON: Object, api: Object,
function prepareFee(): Promise<Object> {
if (instructions.fee !== undefined) {
txJSON.Fee = common.xrpToDrops(instructions.fee);
return new Promise(resolve => resolve(txJSON));
return Promise.resolve(txJSON);
}
const cushion = api._feeCushion;
return common.serverInfo.getFee(api.connection, cushion).then(fee => {
@@ -68,7 +68,7 @@ function prepareTransaction(txJSON: Object, api: Object,
function prepareSequence(): Promise<Object> {
if (instructions.sequence !== undefined) {
txJSON.Sequence = instructions.sequence;
return new Promise(resolve => resolve(txJSON));
return Promise.resolve(txJSON);
}
const request = {
command: 'account_info',