Skip to content

Commit b18f4fb

Browse files
rg911rg911
committed
Updated metadata endpoints
added decode to hex in metadata state mapper
1 parent 7aa3dc4 commit b18f4fb

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed

‎e2e/infrastructure/MetadataHttp.spec.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ describe('MetadataHttp', () => {
277277
expect(metadata[0].metadataEntry.senderPublicKey).to.be.equal(account.publicKey);
278278
expect(metadata[0].metadataEntry.targetPublicKey).to.be.equal(account.publicKey);
279279
expect(metadata[0].metadataEntry.targetId).to.be.undefined;
280-
expect(Convert.decodeHex(metadata[0].metadataEntry.value)).to.be.equal('Test account meta value');
280+
expect(metadata[0].metadataEntry.value).to.be.equal('Test account meta value');
281281
expect(metadata[0].metadataEntry.valueSize).to.be.equal(23);
282282
done();
283283
});
@@ -293,7 +293,7 @@ describe('MetadataHttp', () => {
293293
expect(metadata[0].metadataEntry.senderPublicKey).to.be.equal(account.publicKey);
294294
expect(metadata[0].metadataEntry.targetPublicKey).to.be.equal(account.publicKey);
295295
expect(metadata[0].metadataEntry.targetId).to.be.undefined;
296-
expect(Convert.decodeHex(metadata[0].metadataEntry.value)).to.be.equal('Test account meta value');
296+
expect(metadata[0].metadataEntry.value).to.be.equal('Test account meta value');
297297
expect(metadata[0].metadataEntry.valueSize).to.be.equal(23);
298298
done();
299299
});
@@ -308,7 +308,7 @@ describe('MetadataHttp', () => {
308308
expect(metadata.metadataEntry.senderPublicKey).to.be.equal(account.publicKey);
309309
expect(metadata.metadataEntry.targetPublicKey).to.be.equal(account.publicKey);
310310
expect(metadata.metadataEntry.targetId).to.be.undefined;
311-
expect(Convert.decodeHex(metadata.metadataEntry.value)).to.be.equal('Test account meta value');
311+
expect(metadata.metadataEntry.value).to.be.equal('Test account meta value');
312312
expect(metadata.metadataEntry.valueSize).to.be.equal(23);
313313
done();
314314
});
@@ -324,7 +324,7 @@ describe('MetadataHttp', () => {
324324
expect(metadata[0].metadataEntry.senderPublicKey).to.be.equal(account.publicKey);
325325
expect(metadata[0].metadataEntry.targetPublicKey).to.be.equal(account.publicKey);
326326
expect((metadata[0].metadataEntry.targetId as MosaicId).toHex()).to.be.equal(mosaicId.toHex());
327-
expect(Convert.decodeHex(metadata[0].metadataEntry.value)).to.be.equal('Test mosaic meta value');
327+
expect(metadata[0].metadataEntry.value).to.be.equal('Test mosaic meta value');
328328
expect(metadata[0].metadataEntry.valueSize).to.be.equal(22);
329329
done();
330330
});
@@ -340,7 +340,7 @@ describe('MetadataHttp', () => {
340340
expect(metadata[0].metadataEntry.senderPublicKey).to.be.equal(account.publicKey);
341341
expect(metadata[0].metadataEntry.targetPublicKey).to.be.equal(account.publicKey);
342342
expect((metadata[0].metadataEntry.targetId as MosaicId).toHex()).to.be.equal(mosaicId.toHex());
343-
expect(Convert.decodeHex(metadata[0].metadataEntry.value)).to.be.equal('Test mosaic meta value');
343+
expect(metadata[0].metadataEntry.value).to.be.equal('Test mosaic meta value');
344344
expect(metadata[0].metadataEntry.valueSize).to.be.equal(22);
345345
done();
346346
});
@@ -355,7 +355,7 @@ describe('MetadataHttp', () => {
355355
expect(metadata.metadataEntry.senderPublicKey).to.be.equal(account.publicKey);
356356
expect(metadata.metadataEntry.targetPublicKey).to.be.equal(account.publicKey);
357357
expect((metadata.metadataEntry.targetId as MosaicId).toHex()).to.be.equal(mosaicId.toHex());
358-
expect(Convert.decodeHex(metadata.metadataEntry.value)).to.be.equal('Test mosaic meta value');
358+
expect(metadata.metadataEntry.value).to.be.equal('Test mosaic meta value');
359359
expect(metadata.metadataEntry.valueSize).to.be.equal(22);
360360
done();
361361
});
@@ -371,7 +371,7 @@ describe('MetadataHttp', () => {
371371
expect(metadata[0].metadataEntry.senderPublicKey).to.be.equal(account.publicKey);
372372
expect(metadata[0].metadataEntry.targetPublicKey).to.be.equal(account.publicKey);
373373
expect((metadata[0].metadataEntry.targetId as NamespaceId).toHex()).to.be.equal(namespaceId.toHex());
374-
expect(Convert.decodeHex(metadata[0].metadataEntry.value)).to.be.equal('Test namespace meta value');
374+
expect(metadata[0].metadataEntry.value).to.be.equal('Test namespace meta value');
375375
expect(metadata[0].metadataEntry.valueSize).to.be.equal(25);
376376
done();
377377
});
@@ -387,7 +387,7 @@ describe('MetadataHttp', () => {
387387
expect(metadata[0].metadataEntry.senderPublicKey).to.be.equal(account.publicKey);
388388
expect(metadata[0].metadataEntry.targetPublicKey).to.be.equal(account.publicKey);
389389
expect((metadata[0].metadataEntry.targetId as NamespaceId).toHex()).to.be.equal(namespaceId.toHex());
390-
expect(Convert.decodeHex(metadata[0].metadataEntry.value)).to.be.equal('Test namespace meta value');
390+
expect(metadata[0].metadataEntry.value).to.be.equal('Test namespace meta value');
391391
expect(metadata[0].metadataEntry.valueSize).to.be.equal(25);
392392
done();
393393
});
@@ -402,7 +402,7 @@ describe('MetadataHttp', () => {
402402
expect(metadata.metadataEntry.senderPublicKey).to.be.equal(account.publicKey);
403403
expect(metadata.metadataEntry.targetPublicKey).to.be.equal(account.publicKey);
404404
expect((metadata.metadataEntry.targetId as NamespaceId).toHex()).to.be.equal(namespaceId.toHex());
405-
expect(Convert.decodeHex(metadata.metadataEntry.value)).to.be.equal('Test namespace meta value');
405+
expect(metadata.metadataEntry.value).to.be.equal('Test namespace meta value');
406406
expect(metadata.metadataEntry.valueSize).to.be.equal(25);
407407
done();
408408
});

‎src/infrastructure/MetadataHttp.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import { ClientResponse } from 'http';
1818
import {from as observableFrom, Observable, throwError} from 'rxjs';
1919
import {catchError, map} from 'rxjs/operators';
20+
import { Convert } from '../core/format/Convert';
2021
import { Address } from '../model/account/Address';
2122
import { Metadata } from '../model/metadata/Metadata';
2223
import { MetadataEntry } from '../model/metadata/MetadataEntry';
@@ -259,7 +260,7 @@ export class MetadataHttp extends Http implements MetadataRepository {
259260
UInt64.fromHex(metadataEntry.scopedMetadataKey),
260261
metadataEntry.metadataType.valueOf(),
261262
metadataEntry.valueSize,
262-
metadataEntry.value,
263+
Convert.decodeHex(metadataEntry.value),
263264
targetId,
264265
),
265266
);

‎src/infrastructure/api/metadataRoutesApi.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export class MetadataRoutesApi {
9494
* @param ordering Ordering criteria: * -id - Descending order by id. * id - Ascending order by id.
9595
*/
9696
public async getAccountMetadata (accountId: string, pageSize?: number, id?: string, ordering?: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: MetadataEntriesDTO; }> {
97-
const localVarPath = this.basePath + '/account/{accountId}/metadata'
97+
const localVarPath = this.basePath + '/metadata/account/{accountId}'
9898
.replace('{' + 'accountId' + '}', encodeURIComponent(String(accountId)));
9999
let localVarQueryParameters: any = {};
100100
let localVarHeaderParams: any = (<any>Object).assign({}, this.defaultHeaders);
@@ -163,7 +163,7 @@ export class MetadataRoutesApi {
163163
* @param key Metadata key.
164164
*/
165165
public async getAccountMetadataByKey (accountId: string, key: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: MetadataEntriesDTO; }> {
166-
const localVarPath = this.basePath + '/account/{accountId}/metadata/{key}'
166+
const localVarPath = this.basePath + '/metadata/account/{accountId}/key/{key}'
167167
.replace('{' + 'accountId' + '}', encodeURIComponent(String(accountId)))
168168
.replace('{' + 'key' + '}', encodeURIComponent(String(key)));
169169
let localVarQueryParameters: any = {};
@@ -227,7 +227,7 @@ export class MetadataRoutesApi {
227227
* @param publicKey Account public key
228228
*/
229229
public async getAccountMetadataByKeyAndSender (accountId: string, key: string, publicKey: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: MetadataDTO; }> {
230-
const localVarPath = this.basePath + '/account/{accountId}/metadata/{key}/sender/{publicKey}'
230+
const localVarPath = this.basePath + '/metadata/account/{accountId}/key/{key}/sender/{publicKey}'
231231
.replace('{' + 'accountId' + '}', encodeURIComponent(String(accountId)))
232232
.replace('{' + 'key' + '}', encodeURIComponent(String(key)))
233233
.replace('{' + 'publicKey' + '}', encodeURIComponent(String(publicKey)));
@@ -298,7 +298,7 @@ export class MetadataRoutesApi {
298298
* @param ordering Ordering criteria: * -id - Descending order by id. * id - Ascending order by id.
299299
*/
300300
public async getMosaicMetadata (mosaicId: string, pageSize?: number, id?: string, ordering?: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: MetadataEntriesDTO; }> {
301-
const localVarPath = this.basePath + '/mosaic/{mosaicId}/metadata'
301+
const localVarPath = this.basePath + '/metadata/mosaic/{mosaicId}'
302302
.replace('{' + 'mosaicId' + '}', encodeURIComponent(String(mosaicId)));
303303
let localVarQueryParameters: any = {};
304304
let localVarHeaderParams: any = (<any>Object).assign({}, this.defaultHeaders);
@@ -367,7 +367,7 @@ export class MetadataRoutesApi {
367367
* @param key Metadata key.
368368
*/
369369
public async getMosaicMetadataByKey (mosaicId: string, key: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: MetadataEntriesDTO; }> {
370-
const localVarPath = this.basePath + '/mosaic/{mosaicId}/metadata/{key}'
370+
const localVarPath = this.basePath + '/metadata/mosaic/{mosaicId}/key/{key}'
371371
.replace('{' + 'mosaicId' + '}', encodeURIComponent(String(mosaicId)))
372372
.replace('{' + 'key' + '}', encodeURIComponent(String(key)));
373373
let localVarQueryParameters: any = {};
@@ -431,7 +431,7 @@ export class MetadataRoutesApi {
431431
* @param publicKey Account public key
432432
*/
433433
public async getMosaicMetadataByKeyAndSender (mosaicId: string, key: string, publicKey: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: MetadataDTO; }> {
434-
const localVarPath = this.basePath + '/mosaic/{mosaicId}/metadata/{key}/sender/{publicKey}'
434+
const localVarPath = this.basePath + '/metadata/mosaic/{mosaicId}/key/{key}/sender/{publicKey}'
435435
.replace('{' + 'mosaicId' + '}', encodeURIComponent(String(mosaicId)))
436436
.replace('{' + 'key' + '}', encodeURIComponent(String(key)))
437437
.replace('{' + 'publicKey' + '}', encodeURIComponent(String(publicKey)));
@@ -502,7 +502,7 @@ export class MetadataRoutesApi {
502502
* @param ordering Ordering criteria: * -id - Descending order by id. * id - Ascending order by id.
503503
*/
504504
public async getNamespaceMetadata (namespaceId: string, pageSize?: number, id?: string, ordering?: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: MetadataEntriesDTO; }> {
505-
const localVarPath = this.basePath + '/namespace/{namespaceId}/metadata'
505+
const localVarPath = this.basePath + '/metadata/namespace/{namespaceId}'
506506
.replace('{' + 'namespaceId' + '}', encodeURIComponent(String(namespaceId)));
507507
let localVarQueryParameters: any = {};
508508
let localVarHeaderParams: any = (<any>Object).assign({}, this.defaultHeaders);
@@ -571,7 +571,7 @@ export class MetadataRoutesApi {
571571
* @param key Metadata key.
572572
*/
573573
public async getNamespaceMetadataByKey (namespaceId: string, key: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: MetadataEntriesDTO; }> {
574-
const localVarPath = this.basePath + '/namespace/{namespaceId}/metadata/{key}'
574+
const localVarPath = this.basePath + '/metadata/namespace/{namespaceId}/key/{key}'
575575
.replace('{' + 'namespaceId' + '}', encodeURIComponent(String(namespaceId)))
576576
.replace('{' + 'key' + '}', encodeURIComponent(String(key)));
577577
let localVarQueryParameters: any = {};
@@ -635,7 +635,7 @@ export class MetadataRoutesApi {
635635
* @param publicKey Account public key
636636
*/
637637
public async getNamespaceMetadataByKeyAndSender (namespaceId: string, key: string, publicKey: string, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: MetadataDTO; }> {
638-
const localVarPath = this.basePath + '/namespace/{namespaceId}/metadata/{key}/sender/{publicKey}'
638+
const localVarPath = this.basePath + '/metadata/namespace/{namespaceId}/key/{key}/sender/{publicKey}'
639639
.replace('{' + 'namespaceId' + '}', encodeURIComponent(String(namespaceId)))
640640
.replace('{' + 'key' + '}', encodeURIComponent(String(key)))
641641
.replace('{' + 'publicKey' + '}', encodeURIComponent(String(publicKey)));

0 commit comments

Comments
 (0)