ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-11-20 12:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename toTimestamp/fromTimestamp

Browse Source
This commit is contained in:
Chris Clark
2015-10-26 17:46:57 -07:00
parent 75a427ab27
commit cd5eedff84
7 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/common/index.js
View File

@@ -17,6 +17,6 @@ module.exports = {
convertExceptions: utils.convertExceptions,
convertKeysFromSnakeCaseToCamelCase:
utils.convertKeysFromSnakeCaseToCamelCase,
toTimestamp: utils.toTimestamp,
fromTimestamp: utils.fromTimestamp
rippleToUnixTimestamp: utils.rippleToUnixTimestamp,
unixToRippleTimestamp: utils.unixToRippleTimestamp
};

8
src/api/common/utils.js
View File

@@ -67,7 +67,7 @@ function removeUndefined(obj: Object): Object {
* @return {Number} ms since unix epoch
*
*/
function toTimestamp(rpepoch: number): number {
function rippleToUnixTimestamp(rpepoch: number): number {
return (rpepoch + 0x386D4380) * 1000;
}
@@ -75,7 +75,7 @@ function toTimestamp(rpepoch: number): number {
* @param {Number|Date} timestamp (ms since unix epoch)
* @return {Number} seconds since ripple epoch ( 1/1/2000 GMT)
*/
function fromTimestamp(timestamp: number | Date): number {
function unixToRippleTimestamp(timestamp: number | Date): number {
const timestamp_ = timestamp instanceof Date ?
timestamp.getTime() :
timestamp;
@@ -90,6 +90,6 @@ module.exports = {
generateAddressAPI,
convertKeysFromSnakeCaseToCamelCase,
removeUndefined,
toTimestamp,
fromTimestamp
rippleToUnixTimestamp,
unixToRippleTimestamp
};

5
src/api/ledger/parse/utils.js
View File

@@ -3,7 +3,7 @@
const _ = require('lodash');
const transactionParser = require('ripple-lib-transactionparser');
const utils = require('../utils');
const toTimestamp = utils.common.toTimestamp;
const rippleToUnixTimestamp = utils.common.rippleToUnixTimestamp;
const BigNumber = require('bignumber.js');
function adjustQualityForXRP(
@@ -19,7 +19,8 @@ function adjustQualityForXRP(
}
function parseTimestamp(tx: {date: string}): string | void {
return tx.date ? (new Date(toTimestamp(tx.date))).toISOString() : undefined;
return tx.date ? (new Date(rippleToUnixTimestamp(tx.date))).toISOString()
: undefined;
}
function removeEmptyCounterparty(amount) {

2
src/api/server/server.js
View File

@@ -29,7 +29,7 @@ function getFee(): Promise<number> {
}
function rippleTimeToISO8601(rippleTime: string): string {
return new Date(common.toTimestamp(rippleTime)).toISOString();
return new Date(common.rippleToUnixTimestamp(rippleTime)).toISOString();
}
function formatLedgerClose(ledgerClose: Object): Object {

6
src/api/transaction/suspended-payment-creation.js
View File

@@ -2,7 +2,7 @@
'use strict';
const _ = require('lodash');
const utils = require('./utils');
const {validate, fromTimestamp, toRippledAmount} = utils.common;
const {validate, unixToRippleTimestamp, toRippledAmount} = utils.common;
import type {Instructions, Prepare} from './types.js';
import type {Adjustment, MaxAdjustment, Memo} from '../common/types.js';
@@ -32,10 +32,10 @@ function createSuspendedPaymentCreationTransaction(account: string,
txJSON.Digest = payment.digest;
}
if (payment.allowCancelAfter !== undefined) {
txJSON.CancelAfter = fromTimestamp(payment.allowCancelAfter);
txJSON.CancelAfter = unixToRippleTimestamp(payment.allowCancelAfter);
}
if (payment.allowExecuteAfter !== undefined) {
txJSON.FinishAfter = fromTimestamp(payment.allowExecuteAfter);
txJSON.FinishAfter = unixToRippleTimestamp(payment.allowExecuteAfter);
}
if (payment.source.tag !== undefined) {
txJSON.SourceTag = payment.source.tag;

83
test/account-test.js
View File

@@ -99,35 +99,34 @@ describe('Account', function() {
it('should respond true if the public key corresponds to the account ' +
' address and the master key IS NOT disabled', function(done) {
const options = {Flags: 65536};
const account = new Account(createRemote(options),
'rKXCummUHnenhYudNb9UoJ4mGBR75vFcgz');
account.publicKeyIsActive(
'025B32A54BFA33FB781581F49B235C0E2820C929FF41E677ADA5D3E53CFBA46332',
function(err, is_valid) {
const options = {Flags: 65536};
const account = new Account(createRemote(options),
'rKXCummUHnenhYudNb9UoJ4mGBR75vFcgz');
account.publicKeyIsActive(
'025B32A54BFA33FB781581F49B235C0E2820C929FF41E677ADA5D3E53CFBA46332',
function(err, is_valid) {
assert(err === null);
assert(is_valid === true);
done();
});
assert(err === null);
assert(is_valid === true);
done();
});
});
});
it('should respond false if the public key corresponds to the account ' +
' address and the master key IS disabled', function(done) {
const account = new Account(createRemote(),
'rKXCummUHnenhYudNb9UoJ4mGBR75vFcgz');
account.publicKeyIsActive(
'025B32A54BFA33FB781581F49B235C0E2820C929FF41E677ADA5D3E53CFBA46332',
function(err, is_valid) {
const account = new Account(createRemote(),
'rKXCummUHnenhYudNb9UoJ4mGBR75vFcgz');
account.publicKeyIsActive(
'025B32A54BFA33FB781581F49B235C0E2820C929FF41E677ADA5D3E53CFBA46332',
function(err, is_valid) {
assert(err === null);
assert(is_valid === false);
done();
});
assert(err === null);
assert(is_valid === false);
done();
});
});
});
it('should respond true if the public key corresponds to the regular key',
function(done) {
@@ -149,17 +148,17 @@ describe('Account', function() {
it('should respond false if the public key does not correspond to an ' +
' active public key for the account', function(done) {
const account = new Account(createRemote(),
'rKXCummUHnenhYudNb9UoJ4mGBR75vFcgz');
account.publicKeyIsActive(
'032ECDA93970BC7E8872EF6582CB52A5557F117244A949EB4FA8AC7688CF24FBC8',
function(err, is_valid) {
assert(err === null);
assert(is_valid === false);
done();
});
const account = new Account(createRemote(),
'rKXCummUHnenhYudNb9UoJ4mGBR75vFcgz');
account.publicKeyIsActive(
'032ECDA93970BC7E8872EF6582CB52A5557F117244A949EB4FA8AC7688CF24FBC8',
function(err, is_valid) {
assert(err === null);
assert(is_valid === false);
done();
});
});
});
it('should respond false if the public key is invalid', function(done) {
@@ -189,17 +188,17 @@ describe('Account', function() {
it('should respond false if the public key does not correspond to an ' +
' active public key for the unfunded account', function(done) {
const account = new Account(createRemote(),
'rLdfp6eoR948KVxfn6EpaaNTKwfwXhzSeQ');
account.publicKeyIsActive(
'032ECDA93970BC7E8872EF6582CB52A5557F117244A949EB4FA8AC7688CF24FBC8',
function(err, is_valid) {
assert(err === null);
assert(is_valid === false);
done();
});
const account = new Account(createRemote(),
'rLdfp6eoR948KVxfn6EpaaNTKwfwXhzSeQ');
account.publicKeyIsActive(
'032ECDA93970BC7E8872EF6582CB52A5557F117244A949EB4FA8AC7688CF24FBC8',
function(err, is_valid) {
assert(err === null);
assert(is_valid === false);
done();
});
});
});
});

2
test/api-test.js
View File

@@ -601,7 +601,7 @@ describe('RippleAPI', function() {
assert(false, 'Should throw NetworkError');
}).catch(error => {
assert(error instanceof this.api.errors.RippledError);
assert(error.message.indexOf('slowDown') !== -1);
assert(_.includes(error.message, 'slowDown'));
});
});