Skip to content

issue #82: Fixed MosaicService to pass single MosaicInfo object instead of array #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 12, 2019
Merged

issue #82: Fixed MosaicService to pass single MosaicInfo object instead of array #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf9aba7
issue #82: Fixed MosaicService to pass single MosaicInfo object inste…
evias Mar 12, 2019
b6aa399
issue #82: removed namespaceHttp dependency injection
evias Mar 12, 2019
64e7872
issue #82: removed bugfix in favor of mergeMap bugfix for mosaicInfo …
evias Mar 12, 2019
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
2 changes: 0 additions & 2 deletions e2e/service/MosaicService.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { map, mergeMap, toArray } from 'rxjs/operators';
import { AccountHttp } from '../../src/infrastructure/AccountHttp';
import { MosaicHttp } from '../../src/infrastructure/MosaicHttp';
import { NamespaceHttp } from '../../src/infrastructure/NamespaceHttp';
import { Address } from '../../src/model/account/Address';
import { MosaicService } from '../../src/service/MosaicService';
import { APIUrl } from '../conf/conf.spec';
Expand All @@ -12,7 +11,6 @@ describe('MosaicService', () => {
const mosaicService = new MosaicService(
new AccountHttp(APIUrl),
new MosaicHttp(APIUrl),
new NamespaceHttp(APIUrl),
);

const address = Address.createFromRawAddress('SCO2JY-N6OJSM-CJPPVS-Z3OX7P-TWPQEJ-GZTI6W-GLKK');
Expand Down
5 changes: 2 additions & 3 deletions src/service/MosaicService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ export class MosaicService {
* Constructor
* @param accountHttp
* @param mosaicHttp
* @param namespaceHttp
*/
constructor(private readonly accountHttp: AccountHttp,
private readonly mosaicHttp: MosaicHttp,
private readonly namespaceHttp: NamespaceHttp) {
private readonly mosaicHttp: MosaicHttp) {

}

Expand All @@ -51,6 +49,7 @@ export class MosaicService {
mosaicsView(mosaicIds: MosaicId[]): Observable<MosaicView[]> {
return observableOf(mosaicIds).pipe(
mergeMap((_) => this.mosaicHttp.getMosaics(mosaicIds).pipe(
mergeMap((_) => _),
map((mosaicInfo: MosaicInfo) => {
return new MosaicView(mosaicInfo);
}),
Expand Down
11 changes: 5 additions & 6 deletions test/service/MosaicService.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import {expect} from 'chai';
import {AccountHttp} from '../../src/infrastructure/AccountHttp';
import {MosaicHttp} from '../../src/infrastructure/MosaicHttp';
import {NamespaceHttp} from '../../src/infrastructure/NamespaceHttp';
import {Address} from '../../src/model/account/Address';
import {Mosaic} from '../../src/model/mosaic/Mosaic';
import {MosaicId} from '../../src/model/mosaic/MosaicId';
Expand All @@ -32,7 +31,7 @@ describe('MosaicService', () => {
it('mosaicsView', () => {
const mosaicId = new MosaicId([3294802500, 2243684972]);
const mosaicService = new MosaicService(
new AccountHttp(conf.NIS2_URL), new MosaicHttp(conf.NIS2_URL), new NamespaceHttp(conf.NIS2_URL));
new AccountHttp(conf.NIS2_URL), new MosaicHttp(conf.NIS2_URL));
return mosaicService.mosaicsView([mosaicId]).subscribe((mosaicsView: MosaicView[]) => {
const mosaicView = mosaicsView[0];
expect(mosaicView.mosaicInfo).to.be.an.instanceof(MosaicInfo);
Expand All @@ -42,15 +41,15 @@ describe('MosaicService', () => {
it('mosaicsView of no existing mosaicId', () => {
const mosaicId = new MosaicId([1234, 1234]);
const mosaicService = new MosaicService(
new AccountHttp(conf.NIS2_URL), new MosaicHttp(conf.NIS2_URL), new NamespaceHttp(conf.NIS2_URL));
new AccountHttp(conf.NIS2_URL), new MosaicHttp(conf.NIS2_URL));
return mosaicService.mosaicsView([mosaicId]).subscribe((mosaicsView: MosaicView[]) => {
expect(mosaicsView.length).to.be.equal(0);
});
});

it('mosaicsAmountView', () => {
const mosaicService = new MosaicService(
new AccountHttp(conf.NIS2_URL), new MosaicHttp(conf.NIS2_URL), new NamespaceHttp(conf.NIS2_URL));
new AccountHttp(conf.NIS2_URL), new MosaicHttp(conf.NIS2_URL));
return mosaicService.mosaicsAmountViewFromAddress(Address.createFromRawAddress('SARNASAS2BIAB6LMFA3FPMGBPGIJGK6IJETM3ZSP'))
.subscribe((mosaicsAmountView: MosaicAmountView[]) => {
const mosaicAmountView = mosaicsAmountView[0];
Expand All @@ -60,7 +59,7 @@ describe('MosaicService', () => {

it('mosaicsAmountView of no existing account', () => {
const mosaicService = new MosaicService(
new AccountHttp(conf.NIS2_URL), new MosaicHttp(conf.NIS2_URL), new NamespaceHttp(conf.NIS2_URL));
new AccountHttp(conf.NIS2_URL), new MosaicHttp(conf.NIS2_URL));
return mosaicService.mosaicsAmountViewFromAddress(Address.createFromRawAddress('SCKBZAMIQ6F46QMZUANE6E33KA63KA7KEQ5X6WJW'))
.subscribe((mosaicsAmountView: MosaicAmountView[]) => {
expect(mosaicsAmountView.length).to.be.equal(0);
Expand All @@ -70,7 +69,7 @@ describe('MosaicService', () => {
it('mosaicsAmountView', () => {
const mosaic = new Mosaic(new MosaicId([3646934825, 3576016193]), UInt64.fromUint(1000));
const mosaicService = new MosaicService(
new AccountHttp(conf.NIS2_URL), new MosaicHttp(conf.NIS2_URL), new NamespaceHttp(conf.NIS2_URL));
new AccountHttp(conf.NIS2_URL), new MosaicHttp(conf.NIS2_URL));
return mosaicService.mosaicsAmountView([mosaic]).subscribe((mosaicsAmountView: MosaicAmountView[]) => {
const mosaicAmountView = mosaicsAmountView[0];
expect(mosaicAmountView.mosaicInfo).to.be.an.instanceof(MosaicInfo);
Expand Down