Skip to content

Apply open api 0.8.4 #453

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 17 commits into from Feb 18, 2020
Merged

Apply open api 0.8.4 #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b7e28cc
Fixed #449
rg911 Feb 18, 2020
0bb1832
Updated tests to use async
rg911 Feb 18, 2020
3c9619c
Merge branch 'master' into task/g449_block_service
rg911 Feb 18, 2020
ec38331
Added interface,
rg911 Feb 18, 2020
7a0d720
Merge branch 'task/g449_block_service' of github.com:NEMStudios/nem2-…
rg911 Feb 18, 2020
9ddf862
Merge branch 'master' into task/g449_block_service
rg911 Feb 18, 2020
5c6ef67
Added unit tests
rg911 Feb 18, 2020
c4878c7
Capture error after combineLatest
rg911 Feb 18, 2020
d4b2103
Fixed #451
rg911 Feb 18, 2020
5095c65
Updated ticker
rg911 Feb 18, 2020
4bdea2c
Removed transaction search criteria
rg911 Feb 18, 2020
d752678
Fixed #451
rg911 Feb 18, 2020
8b8a3c2
Updated ticker
rg911 Feb 18, 2020
17c42f1
Removed transaction search criteria
rg911 Feb 18, 2020
cbaf2e7
Merge branch 'task/g451_open_api_0.8.4' of github.com:NEMStudios/nem2…
rg911 Feb 18, 2020
8419038
Fixed test issue
rg911 Feb 18, 2020
2808eb8
Added transaction filter param in accontHttp
rg911 Feb 18, 2020
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
9 changes: 5 additions & 4 deletions e2e/infrastructure/AccountHttp.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import { expect } from 'chai';
import { AccountRepository } from '../../src/infrastructure/AccountRepository';
import { TransactionFilter } from '../../src/infrastructure/infrastructure';
import { MultisigRepository } from '../../src/infrastructure/MultisigRepository';
import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepository';
import { QueryParams } from '../../src/infrastructure/QueryParams';
Expand All @@ -24,7 +25,7 @@ import { Address } from '../../src/model/account/Address';
import { PublicAccount } from '../../src/model/account/PublicAccount';
import { NetworkType } from '../../src/model/blockchain/NetworkType';
import { PlainMessage } from '../../src/model/message/PlainMessage';
import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic';
import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
import { AliasAction } from '../../src/model/namespace/AliasAction';
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
Expand Down Expand Up @@ -92,7 +93,7 @@ describe('AccountHttp', () => {
const transferTransaction = TransferTransaction.create(
Deadline.create(),
account2.address,
[NetworkCurrencyMosaic.createAbsolute(1)],
[NetworkCurrencyLocal.createAbsolute(1)],
PlainMessage.create('test-message'),
networkType,
helper.maxFee,
Expand Down Expand Up @@ -213,7 +214,7 @@ describe('AccountHttp', () => {

describe('transactions', () => {
it('should not return accounts when account does not exist', () => {
return accountRepository.getAccountInfo(Account.generateNewAccount(networkType).address).toPromise().then((r) => {
return accountRepository.getAccountInfo(Account.generateNewAccount(networkType).address).toPromise().then(() => {
return Promise.reject('should fail!');
}, (err) => {
const error = JSON.parse(err.message);
Expand All @@ -227,7 +228,7 @@ describe('AccountHttp', () => {
describe('transactions', () => {
it('should call transactions successfully by type', async () => {
const transactions = await accountRepository.getAccountTransactions(
publicAccount.address, {transactionType: TransactionType.TRANSFER} as QueryParams).toPromise();
publicAccount.address, new QueryParams(), new TransactionFilter().setType([TransactionType.TRANSFER])).toPromise();
expect(transactions.length).to.be.greaterThan(0);
transactions.forEach((t) => {
expect(t.type).to.be.eq(TransactionType.TRANSFER);
Expand Down
7 changes: 4 additions & 3 deletions e2e/infrastructure/BlockHttp.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { ReceiptRepository } from '../../src/infrastructure/ReceiptRepository';
import { Account } from '../../src/model/account/Account';
import { NetworkType } from '../../src/model/blockchain/NetworkType';
import { PlainMessage } from '../../src/model/message/PlainMessage';
import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic';
import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
import { Deadline } from '../../src/model/transaction/Deadline';
import { TransactionInfo } from '../../src/model/transaction/TransactionInfo';
import { TransferTransaction } from '../../src/model/transaction/TransferTransaction';
Expand Down Expand Up @@ -73,7 +73,7 @@ describe('BlockHttp', () => {
const transferTransaction = TransferTransaction.create(
Deadline.create(),
account2.address,
[NetworkCurrencyMosaic.createAbsolute(1)],
[NetworkCurrencyLocal.createAbsolute(1)],
PlainMessage.create('test-message'),
networkType,
helper.maxFee,
Expand Down Expand Up @@ -111,7 +111,8 @@ describe('BlockHttp', () => {
});

it('should return block transactions data given height with paginated transactionId', async () => {
const transactions = await blockRepository.getBlockTransactions(UInt64.fromUint(1), new QueryParams(10, nextId)).toPromise();
const transactions = await blockRepository.getBlockTransactions(UInt64.fromUint(1),
new QueryParams().setPageSize(10).setId(nextId)).toPromise();
expect(transactions[0].transactionInfo!.id).to.be.equal(firstId);
expect(transactions.length).to.be.greaterThan(0);
});
Expand Down
16 changes: 8 additions & 8 deletions e2e/infrastructure/Listener.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { NetworkType } from '../../src/model/blockchain/NetworkType';
import { PlainMessage } from '../../src/model/message/PlainMessage';
import { Address, CosignatureTransaction, LockFundsTransaction, Mosaic, SignedTransaction, UInt64 } from '../../src/model/model';
import { MosaicId } from '../../src/model/mosaic/MosaicId';
import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic';
import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
import { Deadline } from '../../src/model/transaction/Deadline';
Expand All @@ -45,7 +45,7 @@ describe('Listener', () => {
let namespaceRepository: NamespaceRepository;
let generationHash: string;
let networkType: NetworkType;
const networkCurrencyMosaicId: NamespaceId = NetworkCurrencyMosaic.NAMESPACE_ID;
const NetworkCurrencyLocalId: NamespaceId = NetworkCurrencyLocal.NAMESPACE_ID;
let transactionRepository: TransactionRepository;

before(() => {
Expand Down Expand Up @@ -100,7 +100,7 @@ describe('Listener', () => {
mosaicId: MosaicId | NamespaceId) => {
const lockFundsTransaction = LockFundsTransaction.create(
Deadline.create(),
new Mosaic(mosaicId, UInt64.fromUint(10 * Math.pow(10, NetworkCurrencyMosaic.DIVISIBILITY))),
new Mosaic(mosaicId, UInt64.fromUint(10 * Math.pow(10, NetworkCurrencyLocal.DIVISIBILITY))),
UInt64.fromUint(1000),
signedAggregatedTransaction,
networkType, helper.maxFee,
Expand Down Expand Up @@ -180,7 +180,7 @@ describe('Listener', () => {
const transferTransaction = TransferTransaction.create(
Deadline.create(),
cosignAccount1.address,
[new Mosaic(networkCurrencyMosaicId, UInt64.fromUint(10 * Math.pow(10, NetworkCurrencyMosaic.DIVISIBILITY)))],
[new Mosaic(NetworkCurrencyLocalId, UInt64.fromUint(10 * Math.pow(10, NetworkCurrencyLocal.DIVISIBILITY)))],
PlainMessage.create('test-message'),
networkType, helper.maxFee,
);
Expand Down Expand Up @@ -220,7 +220,7 @@ describe('Listener', () => {

it('aggregateBondedTransactionsAdded', (done) => {
const signedAggregatedTx = createSignedAggregatedBondTransaction(multisigAccount, account, account2.address);
createHashLockTransactionAndAnnounce(signedAggregatedTx, account, networkCurrencyMosaicId);
createHashLockTransactionAndAnnounce(signedAggregatedTx, account, NetworkCurrencyLocalId);
helper.listener.aggregateBondedAdded(account.address).subscribe(() => {
done();
});
Expand All @@ -239,7 +239,7 @@ describe('Listener', () => {
const signedAggregatedTx =
createSignedAggregatedBondTransaction(multisigAccount, cosignAccount1, account2.address);

createHashLockTransactionAndAnnounce(signedAggregatedTx, cosignAccount1, networkCurrencyMosaicId);
createHashLockTransactionAndAnnounce(signedAggregatedTx, cosignAccount1, NetworkCurrencyLocalId);
helper.listener.confirmed(cosignAccount1.address).subscribe(() => {
helper.listener.aggregateBondedRemoved(cosignAccount1.address).subscribe(() => {
done();
Expand Down Expand Up @@ -274,7 +274,7 @@ describe('Listener', () => {
const signedAggregatedTx =
createSignedAggregatedBondTransaction(multisigAccount, cosignAccount1, account2.address);

createHashLockTransactionAndAnnounce(signedAggregatedTx, cosignAccount1, networkCurrencyMosaicId);
createHashLockTransactionAndAnnounce(signedAggregatedTx, cosignAccount1, NetworkCurrencyLocalId);
helper.listener.cosignatureAdded(cosignAccount1.address).subscribe(() => {
done();
});
Expand Down Expand Up @@ -341,7 +341,7 @@ describe('Listener', () => {
describe('Transactions Status', () => {

it('transactionStatusGiven', () => {
const mosaics = [NetworkCurrencyMosaic.createRelative(1000000000000)];
const mosaics = [NetworkCurrencyLocal.createRelative(1000000000000)];
const transferTransaction = TransferTransaction.create(
Deadline.create(),
account2.address,
Expand Down
4 changes: 2 additions & 2 deletions e2e/infrastructure/NamespaceHttp.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { expect } from 'chai';
import { NamespaceRepository } from '../../src/infrastructure/NamespaceRepository';
import { Account } from '../../src/model/account/Account';
import { Address } from '../../src/model/account/Address';
import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic';
import { NetworkCurrencyLocal } from '../../src/model/mosaic/NetworkCurrencyLocal';
import { AliasAction } from '../../src/model/namespace/AliasAction';
import { NamespaceId } from '../../src/model/namespace/NamespaceId';
import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
Expand All @@ -28,7 +28,7 @@ import { UInt64 } from '../../src/model/UInt64';
import { IntegrationTestHelper } from './IntegrationTestHelper';

describe('NamespaceHttp', () => {
const defaultNamespaceId = NetworkCurrencyMosaic.NAMESPACE_ID;
const defaultNamespaceId = NetworkCurrencyLocal.NAMESPACE_ID;
let namespaceId: NamespaceId;
let namespaceRepository: NamespaceRepository;
let account: Account;
Expand Down
Loading