From c1bf1fd211fb08e5cc33efe07ce1aa15a32a0ee6 Mon Sep 17 00:00:00 2001 From: Chris Clark Date: Mon, 16 Nov 2015 12:10:17 -0800 Subject: [PATCH] Rename "paymentSequence" to "suspensionSequence" in suspended payments --- .../specifications/suspended-payment-cancellation.json | 4 ++-- .../schemas/specifications/suspended-payment-execution.json | 4 ++-- src/ledger/parse/suspended-payment-cancellation.js | 2 +- src/ledger/parse/suspended-payment-execution.js | 2 +- src/transaction/suspended-payment-cancellation.js | 4 ++-- src/transaction/suspended-payment-execution.js | 4 ++-- .../requests/prepare-suspended-payment-cancellation.json | 2 +- .../requests/prepare-suspended-payment-execution.json | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/common/schemas/specifications/suspended-payment-cancellation.json b/src/common/schemas/specifications/suspended-payment-cancellation.json index 5020217f..e3540fa8 100644 --- a/src/common/schemas/specifications/suspended-payment-cancellation.json +++ b/src/common/schemas/specifications/suspended-payment-cancellation.json @@ -9,11 +9,11 @@ "$ref": "address", "description": "The address of the owner of the suspended payment to cancel." }, - "paymentSequence": { + "suspensionSequence": { "$ref": "sequence", "description": "The [account sequence number](#account-sequence-number) of the [Suspended Payment Creation](#suspended-payment-creation) transaction for the suspended payment to cancel." } }, - "required": ["owner", "paymentSequence"], + "required": ["owner", "suspensionSequence"], "additionalProperties": false } diff --git a/src/common/schemas/specifications/suspended-payment-execution.json b/src/common/schemas/specifications/suspended-payment-execution.json index 5cc345a2..f5e78e84 100644 --- a/src/common/schemas/specifications/suspended-payment-execution.json +++ b/src/common/schemas/specifications/suspended-payment-execution.json @@ -9,7 +9,7 @@ "$ref": "address", "description": "The address of the owner of the suspended payment to execute." }, - "paymentSequence": { + "suspensionSequence": { "$ref": "sequence", "description": "The [account sequence number](#account-sequence-number) of the [Suspended Payment Creation](#suspended-payment-creation) transaction for the suspended payment to execute." }, @@ -28,6 +28,6 @@ "description": "This value will be hashed to produce the digest." } }, - "required": ["owner", "paymentSequence"], + "required": ["owner", "suspensionSequence"], "additionalProperties": false } diff --git a/src/ledger/parse/suspended-payment-cancellation.js b/src/ledger/parse/suspended-payment-cancellation.js index ea1295f0..7ec62a0d 100644 --- a/src/ledger/parse/suspended-payment-cancellation.js +++ b/src/ledger/parse/suspended-payment-cancellation.js @@ -9,7 +9,7 @@ function parseSuspendedPaymentCancellation(tx: Object): Object { return utils.removeUndefined({ memos: utils.parseMemos(tx), owner: tx.Owner, - paymentSequence: tx.OfferSequence + suspensionSequence: tx.OfferSequence }); } diff --git a/src/ledger/parse/suspended-payment-execution.js b/src/ledger/parse/suspended-payment-execution.js index 6b682fbe..fb46e76c 100644 --- a/src/ledger/parse/suspended-payment-execution.js +++ b/src/ledger/parse/suspended-payment-execution.js @@ -9,7 +9,7 @@ function parseSuspendedPaymentExecution(tx: Object): Object { return utils.removeUndefined({ memos: utils.parseMemos(tx), owner: tx.Owner, - paymentSequence: tx.OfferSequence, + suspensionSequence: tx.OfferSequence, method: tx.Method, digest: tx.Digest, proof: tx.Proof ? utils.hexToString(tx.Proof) : undefined diff --git a/src/transaction/suspended-payment-cancellation.js b/src/transaction/suspended-payment-cancellation.js index b710fc3e..8cbf53f0 100644 --- a/src/transaction/suspended-payment-cancellation.js +++ b/src/transaction/suspended-payment-cancellation.js @@ -8,7 +8,7 @@ import type {Memo} from '../common/types.js'; type SuspendedPaymentCancellation = { owner: string, - paymentSequence: number, + suspensionSequence: number, memos?: Array } @@ -19,7 +19,7 @@ function createSuspendedPaymentCancellationTransaction(account: string, TransactionType: 'SuspendedPaymentCancel', Account: account, Owner: payment.owner, - OfferSequence: payment.paymentSequence + OfferSequence: payment.suspensionSequence }; if (payment.memos !== undefined) { txJSON.Memos = _.map(payment.memos, utils.convertMemo); diff --git a/src/transaction/suspended-payment-execution.js b/src/transaction/suspended-payment-execution.js index 8aa444a6..0ce6ae9d 100644 --- a/src/transaction/suspended-payment-execution.js +++ b/src/transaction/suspended-payment-execution.js @@ -8,7 +8,7 @@ import type {Memo} from '../common/types.js'; type SuspendedPaymentExecution = { owner: string, - paymentSequence: number, + suspensionSequence: number, memos?: Array, method?: number, digest?: string, @@ -22,7 +22,7 @@ function createSuspendedPaymentExecutionTransaction(account: string, TransactionType: 'SuspendedPaymentFinish', Account: account, Owner: payment.owner, - OfferSequence: payment.paymentSequence + OfferSequence: payment.suspensionSequence }; if (payment.method !== undefined) { diff --git a/test/fixtures/requests/prepare-suspended-payment-cancellation.json b/test/fixtures/requests/prepare-suspended-payment-cancellation.json index 9925c002..ab7dd27d 100644 --- a/test/fixtures/requests/prepare-suspended-payment-cancellation.json +++ b/test/fixtures/requests/prepare-suspended-payment-cancellation.json @@ -1,4 +1,4 @@ { "owner": "r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59", - "paymentSequence": 1234 + "suspensionSequence": 1234 } diff --git a/test/fixtures/requests/prepare-suspended-payment-execution.json b/test/fixtures/requests/prepare-suspended-payment-execution.json index 9c1d227f..62d2baa9 100644 --- a/test/fixtures/requests/prepare-suspended-payment-execution.json +++ b/test/fixtures/requests/prepare-suspended-payment-execution.json @@ -1,6 +1,6 @@ { "owner": "r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59", - "paymentSequence": 1234, + "suspensionSequence": 1234, "method": 1, "digest": "8F434346648F6B96DF89DDA901C5176B10A6D83961DD3C1AC88B59B2DC327AA4", "proof": "whatever"