Skip to content

Commit 707a7da

Browse files
committed
Fixed Namespace Alias bug
Fixed error handling in Metadata and MosaicRestriction bug
1 parent 56fbd02 commit 707a7da

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

src/infrastructure/NamespaceHttp.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,9 @@ export class NamespaceHttp extends Http implements NamespaceRepository {
270270
*/
271271
private extractAlias(namespace: any): Alias {
272272
if (namespace.alias && namespace.alias.type === AliasType.Mosaic) {
273-
return new MosaicAlias(namespace.alias.mosaicId);
273+
return new MosaicAlias(new MosaicId(namespace.alias.mosaicId));
274274
} else if (namespace.alias && namespace.alias.type === AliasType.Address) {
275-
return new AddressAlias(namespace.alias.address);
275+
return new AddressAlias(Address.createFromEncoded(namespace.alias.address));
276276
}
277277

278278
return new EmptyAlias();

src/service/MetadataTransactionService.ts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ export class MetadataTransactionService {
142142
maxFee,
143143
);
144144
}),
145-
catchError((err) => {
146-
if (err.response.statusCode === 404) {
145+
catchError((err: Error) => {
146+
const error = JSON.parse(err.message);
147+
if (error && error.statusCode && error.statusCode === 404) {
147148
const newValueBytes = Convert.utf8ToUint8(value);
148149
return of(AccountMetadataTransaction.create(
149150
deadline,
@@ -155,7 +156,7 @@ export class MetadataTransactionService {
155156
maxFee,
156157
));
157158
}
158-
throw Error(err);
159+
throw Error(err.message);
159160
}));
160161
}
161162

@@ -195,8 +196,9 @@ export class MetadataTransactionService {
195196
maxFee,
196197
);
197198
}),
198-
catchError((err) => {
199-
if (err.response.statusCode === 404) {
199+
catchError((err: Error) => {
200+
const error = JSON.parse(err.message);
201+
if (error && error.statusCode && error.statusCode === 404) {
200202
const newValueBytes = Convert.utf8ToUint8(value);
201203
return of(MosaicMetadataTransaction.create(
202204
deadline,
@@ -209,7 +211,7 @@ export class MetadataTransactionService {
209211
maxFee,
210212
));
211213
}
212-
throw Error(err);
214+
throw Error(err.message);
213215
}));
214216
}
215217

@@ -249,8 +251,9 @@ export class MetadataTransactionService {
249251
maxFee,
250252
);
251253
}),
252-
catchError((err) => {
253-
if (err.response.statusCode === 404) {
254+
catchError((err: Error) => {
255+
const error = JSON.parse(err.message);
256+
if (error && error.statusCode && error.statusCode === 404) {
254257
const newValueBytes = Convert.utf8ToUint8(value);
255258
return of(NamespaceMetadataTransaction.create(
256259
deadline,
@@ -263,7 +266,7 @@ export class MetadataTransactionService {
263266
maxFee,
264267
));
265268
}
266-
throw Error(err);
269+
throw Error(err.message);
267270
}));
268271
}
269272
}

src/service/MosaicRestrictionTransactionService.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ export class MosaicRestrictionTransactionService {
127127
maxFee,
128128
);
129129
}),
130-
catchError((err) => {
131-
if (err.response && err.response.statusCode && err.response.statusCode === 404) {
130+
catchError((err: Error) => {
131+
const error = JSON.parse(err.message);
132+
if (error && error.statusCode && error.statusCode === 404) {
132133
return of(MosaicAddressRestrictionTransaction.create(
133134
deadline,
134135
mosaicId,
@@ -140,7 +141,7 @@ export class MosaicRestrictionTransactionService {
140141
maxFee,
141142
));
142143
}
143-
throw Error(err);
144+
throw Error(err.message);
144145
}));
145146
}),
146147
);

0 commit comments

Comments
 (0)