diff --git a/src/common/constants.js b/src/common/constants.js index 412ea055..bd45ad5e 100644 --- a/src/common/constants.js +++ b/src/common/constants.js @@ -37,9 +37,6 @@ const AccountFlagIndices = { const AccountFields = { EmailHash: {name: 'emailHash', encoding: 'hex', length: 32, defaults: '0'}, - WalletLocator: {name: 'walletLocator', encoding: 'hex', - length: 64, defaults: '0'}, - WalletSize: {name: 'walletSize', defaults: 0}, MessageKey: {name: 'messageKey'}, Domain: {name: 'domain', encoding: 'hex'}, TransferRate: {name: 'transferRate', defaults: 0, shift: 9}, diff --git a/src/common/schemas/output/get-settings.json b/src/common/schemas/output/get-settings.json index 73ed043a..efe027cc 100644 --- a/src/common/schemas/output/get-settings.json +++ b/src/common/schemas/output/get-settings.json @@ -46,17 +46,6 @@ {"$ref": "hash128"} ] }, - "walletLocator": { - "description": "Hash of wallet in content-addressable storage (CAS) in the Ripple Consensus Ledger (not implemented yet). Use `null` to delete.", - "oneOf": [ - {"type": "null"}, - {"$ref": "hash256"} - ] - }, - "walletSize": { - "type": ["integer", "null"], - "description": "Size of wallet in content-addressable storage (CAS) in the Ripple Consensus Ledger (not implemeneted yet). Use `null` to delete." - }, "messageKey": { "type": "string", "description": "Public key for sending encrypted messages to this account. Conventionally, it should be a secp256k1 key, the same encryption that is used by the rest of Ripple." diff --git a/src/ledger/settings.js b/src/ledger/settings.js index 959a21d8..bd0b3908 100644 --- a/src/ledger/settings.js +++ b/src/ledger/settings.js @@ -21,8 +21,6 @@ type GetSettings = { globalFreeze?: boolean, defaultRipple?: boolean, emailHash?: ?string, - walletLocator?: ?string, - walletSize?: ?number, messageKey?: string, domain?: string, transferRate?: ?number, diff --git a/src/ledger/transaction-types.js b/src/ledger/transaction-types.js index 93389a3e..8920eb2a 100644 --- a/src/ledger/transaction-types.js +++ b/src/ledger/transaction-types.js @@ -45,8 +45,6 @@ type Settings = { globalFreeze?: boolean, defaultRipple?: boolean, emailHash?: string, - walletLocator?: string, - walletSize?: number, messageKey?: string, domain?: string, transferRate?: number, diff --git a/src/transaction/settings-types.js b/src/transaction/settings-types.js index 4f6fbbae..ccc1e054 100644 --- a/src/transaction/settings-types.js +++ b/src/transaction/settings-types.js @@ -31,12 +31,6 @@ type SettingDefaultRipple = { type SettingEmailHash = { emailHash?: ?string, } -type SettingWalletLocator = { - walletLocator?: ?string, -} -type SettingWalletSize = { - walletSize?: ?number, -} type SettingMessageKey = { messageKey?: string, } @@ -54,8 +48,8 @@ type SettingRegularKey = { } export type Settings = SettingRegularKey | SettingSigners | - SettingTransferRate | SettingDomain | SettingMessageKey | SettingWalletSize | - SettingWalletLocator | SettingEmailHash | SettingDefaultRipple | + SettingTransferRate | SettingDomain | SettingMessageKey | + SettingEmailHash | SettingDefaultRipple | SettingGlobalFreeze | SettingNoFreeze | SettingEnableTransactionIDTracking | SettingDisableMasterKey | SettingDisallowIncomingXRP | SettingRequireAuthorization | SettingRequireDestinationTag | diff --git a/test/api-test.js b/test/api-test.js index 3ce1deba..82686003 100644 --- a/test/api-test.js +++ b/test/api-test.js @@ -138,18 +138,12 @@ describe('RippleAPI', function() { _.partial(checkResult, responses.prepareSettings.flagClear, 'prepare')); }); - it('prepareSettings - string field clear', function() { - const settings = {walletLocator: null}; - return this.api.prepareSettings(address, settings, instructions).then( - _.partial(checkResult, responses.prepareSettings.fieldClear, 'prepare')); - }); - it('prepareSettings - integer field clear', function() { - const settings = {walletSize: null}; + const settings = {transferRate: null}; return this.api.prepareSettings(address, settings, instructions) .then(data => { assert(data); - assert.strictEqual(JSON.parse(data.txJSON).WalletSize, 0); + assert.strictEqual(JSON.parse(data.txJSON).TransferRate, 0); }); }); diff --git a/test/fixtures/responses/get-settings.json b/test/fixtures/responses/get-settings.json index ba8d7c19..2071e0ea 100644 --- a/test/fixtures/responses/get-settings.json +++ b/test/fixtures/responses/get-settings.json @@ -2,7 +2,6 @@ "requireDestinationTag": true, "disallowIncomingXRP": true, "emailHash": "23463B99B62A72F26ED677CC556C44E8", - "walletLocator": "00000000000000000000000000000000000000000000000000000000DEADBEEF", "domain": "example.com", "transferRate": 1.002 }