Merge pull request #640 from lumberj/fix-pathfind

Fix: Specify send_max when pathfinding with a source amount

src/ledger/pathfind-types.js

@@ -1,55 +1,55 @@
-/* @flow */
-'use strict';
-
-import type {Amount, LaxLaxAmount, RippledAmount, Adjustment, MaxAdjustment,
-  MinAdjustment} from '../common/types.js';
-
-
-type Path = {
-  source: Adjustment | MaxAdjustment,
-  destination: Adjustment | MinAdjustment,
-  paths: string
-}
-
-export type GetPaths = Array<Path>
-
-export type PathFind = {
-  source: {
-    address: string,
-    amount?: Amount,
-    currencies?: Array<{currency: string, counterparty?:string}>
-  },
-  destination: {
-    address: string,
-    amount: LaxLaxAmount
-  }
-}
-
-export type PathFindRequest = {
-  command: string,
-  source_account: string,
-  destination_amount: RippledAmount,
-  destination_account: string,
-  source_amount?: RippledAmount,
-  source_currencies?: Array<string>
-}
-
-export type RippledPathsResponse = {
-  alternatives: Array<{
-    paths_computed: Array<Array<{
-      type: number,
-      type_hex: string,
-      account?: string,
-      issuer?: string,
-      currency?: string
-    }>>,
-    source_amount: RippledAmount
-  }>,
-  type: string,
-  destination_account: string,
-  destination_amount: RippledAmount,
-  destination_currencies?: Array<string>,
-  source_account?: string,
-  source_currencies?: Array<{currency: string}>,
-  full_reply?: boolean
-}
+/* @flow */
+'use strict';
+
+import type {Amount, LaxLaxAmount, RippledAmount, Adjustment, MaxAdjustment,
+  MinAdjustment} from '../common/types.js';
+
+
+type Path = {
+  source: Adjustment | MaxAdjustment,
+  destination: Adjustment | MinAdjustment,
+  paths: string
+}
+
+export type GetPaths = Array<Path>
+
+export type PathFind = {
+  source: {
+    address: string,
+    amount?: Amount,
+    currencies?: Array<{currency: string, counterparty?:string}>
+  },
+  destination: {
+    address: string,
+    amount: LaxLaxAmount
+  }
+}
+
+export type PathFindRequest = {
+  command: string,
+  source_account: string,
+  destination_amount: RippledAmount,
+  destination_account: string,
+  source_currencies?: Array<string>,
+  send_max?: RippledAmount
+}
+
+export type RippledPathsResponse = {
+  alternatives: Array<{
+    paths_computed: Array<Array<{
+      type: number,
+      type_hex: string,
+      account?: string,
+      issuer?: string,
+      currency?: string
+    }>>,
+    source_amount: RippledAmount
+  }>,
+  type: string,
+  destination_account: string,
+  destination_amount: RippledAmount,
+  destination_currencies?: Array<string>,
+  source_account?: string,
+  source_currencies?: Array<{currency: string}>,
+  full_reply?: boolean
+}

src/ledger/pathfind.js

@@ -46,9 +46,9 @@ function requestPathFind(connection: Connection, pathfind: PathFind): Promise {
       throw new ValidationError('Cannot specify both source.amount'
         + ' and destination.amount.value in getPaths');
     }
-    request.source_amount = toRippledAmount(pathfind.source.amount);
-    if (request.source_amount.currency && !request.source_amount.issuer) {
-      request.source_amount.issuer = pathfind.source.address;
+    request.send_max = toRippledAmount(pathfind.source.amount);
+    if (request.send_max.currency && !request.send_max.issuer) {
+      request.send_max.issuer = pathfind.source.address;
     }
   }
 

test/integration/integration-test.js

@@ -289,6 +289,21 @@ describe('integration tests', function() {
     });
   });
 
+  it('getPaths - send all', function() {
+    const pathfind = requests.getPaths.sendAll;
+    return this.api.getPaths(pathfind).then(data => {
+      assert(data && data.length > 0);
+      assert(_.every(data, path => {
+        return parseFloat(path.source.amount.value)
+        <= parseFloat(pathfind.source.amount.value);
+      }));
+      const path = data[0];
+      assert(path && path.source);
+      assert.strictEqual(path.source.address, pathfind.source.address);
+      assert(path.paths && path.paths.length > 0);
+    });
+  });
+
 
   it('generateWallet', function() {
     const newWallet = this.api.generateAddress();