Remove "type" from PathSet JSON format

This commit is contained in:
Chris Clark
2015-10-13 15:15:21 -07:00
parent 3c3e7ca2eb
commit 9e3c037491
4 changed files with 15 additions and 30 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "ripple-binary-codec",
"version": "0.0.5",
"version": "0.0.6",
"description": "ripple binary codec",
"files": [
"distrib/npm/*",

View File

@@ -34,7 +34,7 @@ const Hop = makeClass({
},
toJSON() {
const type = this.type();
const ret = {type};
const ret = {};
(type & TYPE_ACCOUNT) && (ret.account = this.account.toJSON());
(type & TYPE_ISSUER) && (ret.issuer = this.issuer.toJSON());
(type & TYPE_CURRENCY) && (ret.currency = this.currency.toJSON());

View File

@@ -280,46 +280,35 @@ function pathSetBinaryTests() {
const expectedJSON =
[[{account: 'r9hEDb4xBGRfBCcX3E4FirDWQBAYtpxC8K',
currency: 'BTC',
issuer: 'r9hEDb4xBGRfBCcX3E4FirDWQBAYtpxC8K',
type: 49},
issuer: 'r9hEDb4xBGRfBCcX3E4FirDWQBAYtpxC8K'},
{account: 'rM1oqKtfh1zgjdAgbFmaRm3btfGBX25xVo',
currency: 'BTC',
issuer: 'rM1oqKtfh1zgjdAgbFmaRm3btfGBX25xVo',
type: 49},
issuer: 'rM1oqKtfh1zgjdAgbFmaRm3btfGBX25xVo'},
{account: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
currency: 'BTC',
issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
type: 49},
issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B'},
{currency: 'USD',
issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
type: 48}],
issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B'}],
[{account: 'r9hEDb4xBGRfBCcX3E4FirDWQBAYtpxC8K',
currency: 'BTC',
issuer: 'r9hEDb4xBGRfBCcX3E4FirDWQBAYtpxC8K',
type: 49},
issuer: 'r9hEDb4xBGRfBCcX3E4FirDWQBAYtpxC8K'},
{account: 'rM1oqKtfh1zgjdAgbFmaRm3btfGBX25xVo',
currency: 'BTC',
issuer: 'rM1oqKtfh1zgjdAgbFmaRm3btfGBX25xVo',
type: 49},
issuer: 'rM1oqKtfh1zgjdAgbFmaRm3btfGBX25xVo'},
{account: 'rpvfJ4mR6QQAeogpXEKnuyGBx8mYCSnYZi',
currency: 'BTC',
issuer: 'rpvfJ4mR6QQAeogpXEKnuyGBx8mYCSnYZi',
type: 49},
issuer: 'rpvfJ4mR6QQAeogpXEKnuyGBx8mYCSnYZi'},
{currency: 'USD',
issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
type: 48}],
issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B'}],
[{account: 'r9hEDb4xBGRfBCcX3E4FirDWQBAYtpxC8K',
currency: 'BTC',
issuer: 'r9hEDb4xBGRfBCcX3E4FirDWQBAYtpxC8K',
type: 49},
issuer: 'r9hEDb4xBGRfBCcX3E4FirDWQBAYtpxC8K'},
{account: 'r3AWbdp2jQLXLywJypdoNwVSvr81xs3uhn',
currency: 'BTC',
issuer: 'r3AWbdp2jQLXLywJypdoNwVSvr81xs3uhn',
type: 49},
{currency: '0000000000000000000000005852500000000000', type: 16},
issuer: 'r3AWbdp2jQLXLywJypdoNwVSvr81xs3uhn'},
{currency: '0000000000000000000000005852500000000000'},
{currency: 'USD',
issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
type: 48}]];
issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B'}]];
it('works with long paths', () => {
const parser = makeParser(bytes);

View File

@@ -1309,7 +1309,6 @@
"Flags": 0,
"Sequence": 6,
"Paths": [[{
"type": 1,
"account": "razqQKzJRdB4UxFPWf5NEpEG3WMkmwgcXA"
}]],
"DestinationTag": 736049272
@@ -1414,7 +1413,6 @@
"00"
],
"json": [[{
"type": 1,
"account": "razqQKzJRdB4UxFPWf5NEpEG3WMkmwgcXA"
}]],
"field_header": "0112"
@@ -1850,7 +1848,6 @@
"Sequence": 10,
"Paths": [[{
"currency": "BTC",
"type": 48,
"issuer": "rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"
}]],
"InvoiceID": "342B8D16BEE494D169034AFF0908FDE35874A38E548D4CEC8DFC5C49E9A33B76",
@@ -1958,7 +1955,6 @@
],
"json": [[{
"currency": "BTC",
"type": 48,
"issuer": "rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"
}]],
"field_header": "0112"
@@ -3664,4 +3660,4 @@
"expected_hex": "8D"
}
]
}
}