Skip to content

fix: announce method missing observable map #795

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 1 commit into from
Jun 23, 2021
Merged

fix: announce method missing observable map #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 37 additions & 33 deletions src/service/TransactionService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,29 @@
*/

import { combineLatest, merge, Observable, of } from 'rxjs';
import { first, flatMap, map, mergeMap, toArray } from 'rxjs/operators';
import { IListener } from '../infrastructure/IListener';
import { ReceiptPaginationStreamer } from '../infrastructure/paginationStreamer/ReceiptPaginationStreamer';
import { ReceiptRepository } from '../infrastructure/ReceiptRepository';
import { TransactionGroup } from '../infrastructure/TransactionGroup';
import { TransactionRepository } from '../infrastructure/TransactionRepository';
import { Address } from '../model/account/Address';
import { NamespaceId } from '../model/namespace/NamespaceId';
import { Statement } from '../model/receipt/Statement';
import { AccountAddressRestrictionTransaction } from '../model/transaction/AccountAddressRestrictionTransaction';
import { AggregateTransaction } from '../model/transaction/AggregateTransaction';
import { LockFundsTransaction } from '../model/transaction/LockFundsTransaction';
import { MosaicAddressRestrictionTransaction } from '../model/transaction/MosaicAddressRestrictionTransaction';
import { MosaicGlobalRestrictionTransaction } from '../model/transaction/MosaicGlobalRestrictionTransaction';
import { MosaicMetadataTransaction } from '../model/transaction/MosaicMetadataTransaction';
import { MosaicSupplyChangeTransaction } from '../model/transaction/MosaicSupplyChangeTransaction';
import { SecretLockTransaction } from '../model/transaction/SecretLockTransaction';
import { SecretProofTransaction } from '../model/transaction/SecretProofTransaction';
import { SignedTransaction } from '../model/transaction/SignedTransaction';
import { Transaction } from '../model/transaction/Transaction';
import { TransactionStatusError } from '../model/transaction/TransactionStatusError';
import { TransactionType } from '../model/transaction/TransactionType';
import { TransferTransaction } from '../model/transaction/TransferTransaction';
import { ITransactionService } from './interfaces/ITransactionService';
import { first, map, mergeMap, toArray } from 'rxjs/operators';
import { IListener, ReceiptRepository, TransactionGroup, TransactionRepository } from '../infrastructure';
import { ReceiptPaginationStreamer } from '../infrastructure/paginationStreamer';
import { Address } from '../model/account';
import { NamespaceId } from '../model/namespace';
import { Statement } from '../model/receipt';
import {
AccountAddressRestrictionTransaction,
AggregateTransaction,
LockFundsTransaction,
MosaicAddressRestrictionTransaction,
MosaicGlobalRestrictionTransaction,
MosaicMetadataTransaction,
MosaicSupplyChangeTransaction,
SecretLockTransaction,
SecretProofTransaction,
SignedTransaction,
Transaction,
TransactionStatusError,
TransactionType,
TransferTransaction,
} from '../model/transaction';
import { ITransactionService } from './interfaces';

/**
* Transaction Service
Expand Down Expand Up @@ -73,13 +72,18 @@ export class TransactionService implements ITransactionService {
*/
public announce(signedTransaction: SignedTransaction, listener: IListener): Observable<Transaction> {
const signerAddress = signedTransaction.getSignerAddress();
this.transactionRepository.announce(signedTransaction);
return this.getTransactionOrRaiseError(
listener,
signerAddress,
signedTransaction.hash,
listener.confirmed(signerAddress, signedTransaction.hash),
);
return this.transactionRepository
.announce(signedTransaction)
.pipe(
mergeMap(() =>
this.getTransactionOrRaiseError(
listener,
signerAddress,
signedTransaction.hash,
listener.confirmed(signerAddress, signedTransaction.hash),
),
),
);
}

/**
Expand All @@ -93,7 +97,7 @@ export class TransactionService implements ITransactionService {
const signerAddress = signedTransaction.getSignerAddress();
const transactionObservable = this.transactionRepository
.announceAggregateBonded(signedTransaction)
.pipe(flatMap(() => listener.aggregateBondedAdded(signerAddress, signedTransaction.hash)));
.pipe(mergeMap(() => listener.aggregateBondedAdded(signerAddress, signedTransaction.hash)));
return this.getTransactionOrRaiseError(listener, signerAddress, signedTransaction.hash, transactionObservable);
}

Expand All @@ -113,7 +117,7 @@ export class TransactionService implements ITransactionService {
listener: IListener,
): Observable<AggregateTransaction> {
return this.announce(signedHashLockTransaction, listener).pipe(
flatMap(() => this.announceAggregateBonded(signedAggregateTransaction, listener)),
mergeMap(() => this.announceAggregateBonded(signedAggregateTransaction, listener)),
);
}

Expand Down
52 changes: 38 additions & 14 deletions test/service/TransactionService.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@

import { ChronoUnit } from '@js-joda/core';
import { expect } from 'chai';
import { EMPTY, of as observableOf } from 'rxjs';
import { EMPTY, from, of as observableOf } from 'rxjs';
import { deepEqual, instance, mock, when } from 'ts-mockito';
import { IListener } from '../../src/infrastructure/IListener';
import { ReceiptRepository } from '../../src/infrastructure/ReceiptRepository';
import { TransactionRepository } from '../../src/infrastructure/TransactionRepository';
import { IListener, ReceiptRepository, TransactionRepository } from '../../src/infrastructure';
import { UInt64 } from '../../src/model';
import { Account, Address } from '../../src/model/account';
import { PlainMessage } from '../../src/model/message/PlainMessage';
import { NetworkType } from '../../src/model/network/NetworkType';
import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
import { Deadline } from '../../src/model/transaction/Deadline';
import { HashLockTransaction } from '../../src/model/transaction/HashLockTransaction';
import { TransactionAnnounceResponse } from '../../src/model/transaction/TransactionAnnounceResponse';
import { TransactionStatusError } from '../../src/model/transaction/TransactionStatusError';
import { TransferTransaction } from '../../src/model/transaction/TransferTransaction';
import { UInt64 } from '../../src/model/UInt64';
import { TransactionService } from '../../src/service/TransactionService';
import { PlainMessage } from '../../src/model/message';
import { NetworkType } from '../../src/model/network';
import {
AggregateTransaction,
Deadline,
HashLockTransaction,
TransactionAnnounceResponse,
TransactionStatusError,
TransferTransaction,
} from '../../src/model/transaction';
import { TransactionService } from '../../src/service';
import { NetworkCurrencyLocal } from '../model/mosaic/Currency.spec';

/**
Expand Down Expand Up @@ -81,6 +81,30 @@ describe('TransactionService', () => {
listener = mock();
});

it('announce transaction when reject promise', async () => {
const signedTransaction = account.sign(transferTransaction, generationHash);
when(transactionRepositoryMock.announce(deepEqual(signedTransaction))).thenReturn(from(Promise.reject(Error('break this!'))));
const service = new TransactionService(instance(transactionRepositoryMock), instance(mockedReceiptRepository));
try {
await service.announce(signedTransaction, instance(listener)).toPromise();
expect(false).true;
} catch (e) {
expect(e.message).eq('break this!');
}
});

it('announce transaction when exception', async () => {
const signedTransaction = account.sign(transferTransaction, generationHash);
when(transactionRepositoryMock.announce(deepEqual(signedTransaction))).thenThrow(Error('break this!'));
const service = new TransactionService(instance(transactionRepositoryMock), instance(mockedReceiptRepository));
try {
await service.announce(signedTransaction, instance(listener)).toPromise();
expect(false).true;
} catch (e) {
expect(e.message).eq('break this!');
}
});

it('announce when valid transaction', async () => {
const signedTransaction = account.sign(transferTransaction, generationHash);

Expand Down