boost coverage to almost 100%

Author: darkdarkdragon

docs/index.md

@@ -112,6 +112,7 @@ feeCushion | number | *Optional* Factor to multiply estimated fee by to provide
 proxy | uri string | *Optional* URI for HTTP/HTTPS proxy to use to connect to the rippled server.
 proxyAuthorization | string | *Optional* Username and password for HTTP basic authentication to the proxy in the format **username:password**.
 servers | array\<uri string\> | *Optional* Array of rippled servers to connect to. Currently only one server is supported.
+timeout | integer | *Optional* Timeout in milliseconds before considering a request to have failed.
 trace | boolean | *Optional* If true, log rippled requests and responses to stdout.
 trustedCertificates | array\<string\> | *Optional* Array of PEM-formatted SSL certificates to trust when connecting to a proxy. This is useful if you want to use a self-signed certificate on the proxy server. Note: Each element must contain a single certificate; concatenated certificates are not valid.
 
@@ -373,7 +374,8 @@ passive | boolean | *Optional* If enabled, the offer will not consume offers tha
     "currency": "XRP",
     "value": "2"
   },
-  "immediateOrCancel": true
+  "passive": true,
+  "fillOrKill": true
 }
 ```
 
@@ -1120,7 +1122,7 @@ counterparty | object | Properties of the trustline from the perspective of the
 *counterparty.* frozen | boolean | *Optional* If true, the trustline is frozen, which means that funds can only be sent to the counterparty.
 *counterparty.* ripplingDisabled | boolean | *Optional* If true, payments cannot ripple through this trustline.
 state | object | Properties of the trustline regarding it's current state that are not part of the specification.
-*state.* balance | [value](#value) | The balance on the trustline, representing which party owes the other and by how much.
+*state.* balance | [signedValue](#value) | The balance on the trustline, representing which party owes the other and by how much.
 
 ### Example
 
@@ -2888,7 +2890,8 @@ const order = {
     "currency": "XRP",
     "value": "2"
   },
-  "immediateOrCancel": true
+  "passive": true,
+  "fillOrKill": true
 };
 return api.prepareOrder(address, order)
   .then(prepared => {/* ... */});
@@ -2897,11 +2900,11 @@ return api.prepareOrder(address, order)
 
 ```json
 {
-  "txJSON": "{\"Flags\":2147614720,\"TransactionType\":\"OfferCreate\",\"Account\":\"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59\",\"TakerGets\":\"2000000\",\"TakerPays\":{\"value\":\"10.1\",\"currency\":\"USD\",\"issuer\":\"rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM\"},\"LastLedgerSequence\":8820051,\"Fee\":\"12\",\"Sequence\":23}",
+  "txJSON": "{\"Flags\":2147811328,\"TransactionType\":\"OfferCreate\",\"Account\":\"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59\",\"TakerGets\":\"2000000\",\"TakerPays\":{\"value\":\"10.1\",\"currency\":\"USD\",\"issuer\":\"rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM\"},\"LastLedgerSequence\":8819954,\"Fee\":\"12\",\"Sequence\":23}",
   "instructions": {
     "fee": "0.000012",
     "sequence": 23,
-    "maxLedgerVersion": 8820051
+    "maxLedgerVersion": 8819954
   }
 }
 ```

src/common/connection.js

@@ -80,6 +80,7 @@ class Connection extends EventEmitter {
   }
 
   _onUnexpectedClose() {
+    this._ws = null;
     this._isReady = false;
     this.connect().then();
   }
@@ -140,7 +141,8 @@ class Connection extends EventEmitter {
           this._proxyAuthorization, this._authorization,
           this._trustedCertificates);
         this._ws.on('message', this._onMessage.bind(this));
-        this._ws.once('close', () => this._onUnexpectedClose);
+        this._onUnexpectedCloseBound = this._onUnexpectedClose.bind(this);
+        this._ws.once('close', this._onUnexpectedCloseBound);
         this._ws.once('open', () => this._onOpen().then(resolve, reject));
       }
     });
@@ -153,7 +155,7 @@ class Connection extends EventEmitter {
       } else if (this._state === WebSocket.CLOSING) {
         this._ws.once('close', resolve);
       } else {
-        this._ws.removeListener('close', this._onUnexpectedClose);
+        this._ws.removeListener('close', this._onUnexpectedCloseBound);
         this._ws.once('close', () => {
           this._ws = null;
           this._isReady = false;

src/common/schemas/input/api-options.json

@@ -26,6 +26,11 @@
       "format": "uri",
       "description": "URI for HTTP/HTTPS proxy to use to connect to the rippled server."
     },
+    "timeout": {
+      "type": "integer",
+      "description": "Timeout in milliseconds before considering a request to have failed.",
+      "minimum": 1
+    },
     "proxyAuthorization": {
       "type": "string",
       "description": "Username and password for HTTP basic authentication to the proxy in the format **username:password**."

src/common/schemas/output/get-trustlines.json

@@ -34,7 +34,7 @@
       "state": {
         "properties": {
           "balance": {
-            "$ref": "value",
+            "$ref": "signedValue",
             "description": "The balance on the trustline, representing which party owes the other and by how much."
           }
         },

src/index.js

@@ -54,7 +54,8 @@ type APIOptions = {
   servers?: Array<string>,
   feeCushion?: number,
   trace?: boolean,
-  proxy?: string
+  proxy?: string,
+  timeout?: number
 }
 
 // prevent access to non-validated ledger versions

src/ledger/transactions.js

@@ -47,9 +47,6 @@ function parseAccountTxTransaction(tx) {
 }
 
 function counterpartyFilter(filters, tx: TransactionType) {
-  if (!filters.counterparty) {
-    return true;
-  }
   if (tx.address === filters.counterparty || (
     tx.specification && (
       (tx.specification.destination &&

src/transaction/payment.js

@@ -33,8 +33,10 @@ type Payment = {
 }
 
 function isXRPToXRPPayment(payment: Payment): boolean {
-  const sourceCurrency = _.get(payment, 'source.maxAmount.currency');
-  const destinationCurrency = _.get(payment, 'destination.amount.currency');
+  const sourceCurrency = _.get(payment, 'source.maxAmount.currency',
+    _.get(payment, 'source.amount.currency'));
+  const destinationCurrency = _.get(payment, 'destination.amount.currency',
+    _.get(payment, 'destination.minAmount.currency'));
   return sourceCurrency === 'XRP' && destinationCurrency === 'XRP';
 }
 

src/transaction/trustline.js

@@ -8,8 +8,7 @@ import type {Instructions, Prepare} from './types.js';
 import type {TrustLineSpecification} from '../ledger/trustlines-types.js';
 
 function convertQuality(quality) {
-  return quality === undefined ? undefined :
-    (new BigNumber(quality)).shift(9).truncated().toNumber();
+  return (new BigNumber(quality)).shift(9).truncated().toNumber();
 }
 
 function createTrustlineTransaction(account: string,