Skip to content
This repository was archived by the owner on Jun 10, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions rest/src/db/dbUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,11 @@ const dbUtils = {
},

/**
* Formats binary to a base32 address or hex address
* Formats binary to a base32 address
* @param {MongoDb.Binary} binary Address|NamespaceId from MongoDb.
* @param {boolean} formatAddressUsingBase32 if base32 format should be used when formatting an address. Hex otherwise.
* @returns {string} the address in base32 format or hex format depending on formatAddressUsingBase32
* @returns {string} the address in base32 format
*/
bufferToUnresolvedAddress: (binary, formatAddressUsingBase32) => {
bufferToUnresolvedAddress: binary => {
if (!binary)
return undefined;

Expand All @@ -102,7 +101,8 @@ const dbUtils = {
`Cannot convert binary address, unknown ${binary.constructor.name} type`
);
};
return formatAddressUsingBase32 ? address.addressToString(getBuffer()) : catapult.utils.convert.uint8ToHex(getBuffer());

return address.addressToString(getBuffer());
},

/**
Expand Down
6 changes: 3 additions & 3 deletions rest/test/db/dbFormattingRules_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,14 @@ describe('db formatting rules', () => {
});
});

it('can format encodedAddress type using hex', () => {
it('can format encodedAddress type', () => {
// Arrange
const object = test.factory.createBinary(Buffer.from('98E0D138EAF2AC342C015FF0B631EC3622E8AFFA04BFCC56', 'hex'));

// Act:
const result = formattingRules[ModelType.encodedAddress](object, false);
const result = formattingRules[ModelType.encodedAddress](object);

// Assert:
expect(result).to.equal('98E0D138EAF2AC342C015FF0B631EC3622E8AFFA04BFCC56');
expect(result).to.equal('TDQNCOHK6KWDILABL7YLMMPMGYRORL72AS74YVQ');
});
});
13 changes: 1 addition & 12 deletions rest/test/db/dbUtils_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,22 +173,11 @@ describe('db utils', () => {
// Arrange
const object = Buffer.from('98E0D138EAF2AC342C015FF0B631EC3622E8AFFA04BFCC56', 'hex');

// Act:
const result = dbUtils.bufferToUnresolvedAddress(object, true);

// Assert:
expect(result).to.equal('TDQNCOHK6KWDILABL7YLMMPMGYRORL72AS74YVQ');
});

it('can convert from Buffer to decoded address', () => {
// Arrange
const object = Buffer.from('98E0D138EAF2AC342C015FF0B631EC3622E8AFFA04BFCC56', 'hex');

// Act:
const result = dbUtils.bufferToUnresolvedAddress(object);

// Assert:
expect(result).to.equal('98E0D138EAF2AC342C015FF0B631EC3622E8AFFA04BFCC56');
expect(result).to.equal('TDQNCOHK6KWDILABL7YLMMPMGYRORL72AS74YVQ');
});

it('can convert from undefined to undefined address', () => {
Expand Down
4 changes: 2 additions & 2 deletions rest/test/server/messageFormattingRules_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,14 @@ describe('message formatting rules', () => {
expect(result).to.deep.equal(true);
});

it('can format decodedAddress type', () => {
it('can format encodedAddress type', () => {
// Arrange:
const object = test.factory.createBinary(Buffer.from('98E0D138EAF2AC342C015FF0B631EC3622E8AFFA04BFCC56', 'hex'));

// Act:
const result = formattingRules[ModelType.encodedAddress](object);

// Assert:
expect(result).to.deep.equal('98E0D138EAF2AC342C015FF0B631EC3622E8AFFA04BFCC56');
expect(result).to.deep.equal('TDQNCOHK6KWDILABL7YLMMPMGYRORL72AS74YVQ');
});
});