Remove walletLocator and walletSize from settings

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},

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."

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,

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,

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 |

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);
       });
   });
 

test/fixtures/responses/get-settings.json

@@ -2,7 +2,6 @@
   "requireDestinationTag": true,
   "disallowIncomingXRP": true,
   "emailHash": "23463B99B62A72F26ED677CC556C44E8",
-  "walletLocator": "00000000000000000000000000000000000000000000000000000000DEADBEEF",
   "domain": "example.com",
   "transferRate": 1.002
 }