Skip to content

Commit dd2ad72

Browse files
fboucquezfboucquez
committed
Open Api Library
Removed open api generated code Removed open api templates Updated open api imports Patched some client call lines Added TransactionHttp tests mocking open api route clients.
1 parent e6d5dc4 commit dd2ad72

File tree

212 files changed

+560
-19218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+560
-19218
lines changed

‎package-lock.json‎

Lines changed: 355 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"dependencies": {
6060
"bluebird": "^3.5.5",
6161
"catbuffer": "0.0.6-SNAPSHOT",
62+
"nem2-sdk-openapi-typescript-node-client": "0.7.2-0.6-SNAPSHOT.201912301439",
6263
"crypto-js": "^3.1.9-1",
6364
"js-joda": "^1.6.2",
6465
"js-sha256": "^0.9.0",

‎src/infrastructure/AccountHttp.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17+
import { AccountInfoDTO, AccountRoutesApi } from 'nem2-sdk-openapi-typescript-node-client';
1718
import { from as observableFrom, Observable, throwError } from 'rxjs';
1819
import { catchError, map } from 'rxjs/operators';
1920
import { AccountInfo } from '../model/account/AccountInfo';
@@ -25,7 +26,6 @@ import { AggregateTransaction } from '../model/transaction/AggregateTransaction'
2526
import { Transaction } from '../model/transaction/Transaction';
2627
import { UInt64 } from '../model/UInt64';
2728
import { AccountRepository } from './AccountRepository';
28-
import { AccountInfoDTO, AccountRoutesApi } from './api';
2929
import { Http } from './Http';
3030
import { QueryParams } from './QueryParams';
3131
import { CreateTransactionFromDTO } from './transaction/CreateTransactionFromDTO';

‎src/infrastructure/BlockHttp.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17+
import { BlockInfoDTO, BlockRoutesApi } from 'nem2-sdk-openapi-typescript-node-client';
1718
import { from as observableFrom, Observable, throwError } from 'rxjs';
1819
import { catchError, map } from 'rxjs/operators';
1920
import { PublicAccount } from '../model/account/PublicAccount';
@@ -22,14 +23,10 @@ import { MerklePathItem } from '../model/blockchain/MerklePathItem';
2223
import { MerkleProofInfo } from '../model/blockchain/MerkleProofInfo';
2324
import { Transaction } from '../model/transaction/Transaction';
2425
import { UInt64 } from '../model/UInt64';
25-
import { BlockInfoDTO, BlockRoutesApi } from './api';
2626
import { BlockRepository } from './BlockRepository';
2727
import { Http } from './Http';
2828
import { QueryParams } from './QueryParams';
29-
import {
30-
CreateTransactionFromDTO,
31-
extractBeneficiary,
32-
} from './transaction/CreateTransactionFromDTO';
29+
import { CreateTransactionFromDTO, extractBeneficiary, } from './transaction/CreateTransactionFromDTO';
3330

3431
/**
3532
* Blockchain http repository.

‎src/infrastructure/ChainHttp.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
import {from as observableFrom, Observable, throwError} from 'rxjs';
18-
import {catchError, map} from 'rxjs/operators';
19-
import {BlockchainScore} from '../model/blockchain/BlockchainScore';
20-
import {UInt64} from '../model/UInt64';
21-
import { ChainRoutesApi } from './api';
17+
import { ChainRoutesApi } from 'nem2-sdk-openapi-typescript-node-client';
18+
import { from as observableFrom, Observable, throwError } from 'rxjs';
19+
import { catchError, map } from 'rxjs/operators';
20+
import { BlockchainScore } from '../model/blockchain/BlockchainScore';
21+
import { UInt64 } from '../model/UInt64';
2222
import { ChainRepository } from './ChainRepository';
23-
import {Http} from './Http';
23+
import { Http } from './Http';
2424

2525
/**
2626
* Chian http repository.

‎src/infrastructure/DiagnosticHttp.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
import {from as observableFrom, Observable, throwError} from 'rxjs';
18-
import {catchError, map} from 'rxjs/operators';
19-
import {BlockchainStorageInfo} from '../model/blockchain/BlockchainStorageInfo';
17+
import { DiagnosticRoutesApi } from 'nem2-sdk-openapi-typescript-node-client';
18+
import { from as observableFrom, Observable, throwError } from 'rxjs';
19+
import { catchError, map } from 'rxjs/operators';
20+
import { BlockchainStorageInfo } from '../model/blockchain/BlockchainStorageInfo';
2021
import { ServerInfo } from '../model/diagnostic/ServerInfo';
21-
import { DiagnosticRoutesApi } from './api';
22-
import {DiagnosticRepository} from './DiagnosticRepository';
23-
import {Http} from './Http';
22+
import { DiagnosticRepository } from './DiagnosticRepository';
23+
import { Http } from './Http';
2424

2525
/**
2626
* Diagnostic http repository.

‎src/infrastructure/Http.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17+
import { NodeRoutesApi } from 'nem2-sdk-openapi-typescript-node-client';
1718
// tslint:disable-next-line: ordered-imports
1819
import { from as observableFrom, Observable, of as observableOf, throwError } from 'rxjs';
1920
import { catchError, map, shareReplay } from 'rxjs/operators';
2021
import { NetworkType } from '../model/blockchain/NetworkType';
21-
import { NodeRoutesApi } from './api/nodeRoutesApi';
2222
import { QueryParams } from './QueryParams';
2323

2424
/**

‎src/infrastructure/MetadataHttp.ts‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,18 @@
1414
* limitations under the License.
1515
*/
1616

17-
import {from as observableFrom, Observable, throwError} from 'rxjs';
18-
import {catchError, map} from 'rxjs/operators';
17+
import { MetadataDTO, MetadataRoutesApi } from 'nem2-sdk-openapi-typescript-node-client';
18+
import { from as observableFrom, Observable, throwError } from 'rxjs';
19+
import { catchError, map } from 'rxjs/operators';
1920
import { Convert } from '../core/format/Convert';
2021
import { Address } from '../model/account/Address';
21-
import { NetworkType } from '../model/blockchain/NetworkType';
2222
import { Metadata } from '../model/metadata/Metadata';
2323
import { MetadataEntry } from '../model/metadata/MetadataEntry';
2424
import { MetadataType } from '../model/metadata/MetadataType';
25-
import {MosaicId} from '../model/mosaic/MosaicId';
26-
import {NamespaceId} from '../model/namespace/NamespaceId';
27-
import {UInt64} from '../model/UInt64';
28-
import { MetadataDTO, MetadataRoutesApi } from './api';
29-
import {Http} from './Http';
25+
import { MosaicId } from '../model/mosaic/MosaicId';
26+
import { NamespaceId } from '../model/namespace/NamespaceId';
27+
import { UInt64 } from '../model/UInt64';
28+
import { Http } from './Http';
3029
import { MetadataRepository } from './MetadataRepository';
3130
import { QueryParams } from './QueryParams';
3231

@@ -214,10 +213,10 @@ export class MetadataHttp extends Http implements MetadataRepository {
214213

215214
switch (metadataEntry.metadataType.valueOf()) {
216215
case MetadataType.Mosaic:
217-
targetId = new MosaicId(metadataEntry.targetId);
216+
targetId = new MosaicId(metadataEntry.targetId as any);
218217
break;
219218
case MetadataType.Namespace:
220-
targetId = NamespaceId.createFromEncoded(metadataEntry.targetId);
219+
targetId = NamespaceId.createFromEncoded(metadataEntry.targetId as any);
221220
break;
222221
default:
223222
targetId = undefined;

‎src/infrastructure/MosaicHttp.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
* limitations under the License.
1515
*/
1616

17-
import {from as observableFrom, Observable, throwError} from 'rxjs';
18-
import {catchError, map, mergeMap} from 'rxjs/operators';
17+
import { MosaicRoutesApi } from 'nem2-sdk-openapi-typescript-node-client';
18+
import { from as observableFrom, Observable, throwError } from 'rxjs';
19+
import { catchError, map, mergeMap } from 'rxjs/operators';
1920
import { Address } from '../model/account/Address';
20-
import {PublicAccount} from '../model/account/PublicAccount';
21+
import { PublicAccount } from '../model/account/PublicAccount';
2122
import { NetworkType } from '../model/blockchain/NetworkType';
22-
import {MosaicFlags} from '../model/mosaic/MosaicFlags';
23-
import {MosaicId} from '../model/mosaic/MosaicId';
24-
import {MosaicInfo} from '../model/mosaic/MosaicInfo';
25-
import {UInt64} from '../model/UInt64';
26-
import { MosaicRoutesApi } from './api';
27-
import {Http} from './Http';
28-
import {MosaicRepository} from './MosaicRepository';
23+
import { MosaicFlags } from '../model/mosaic/MosaicFlags';
24+
import { MosaicId } from '../model/mosaic/MosaicId';
25+
import { MosaicInfo } from '../model/mosaic/MosaicInfo';
26+
import { UInt64 } from '../model/UInt64';
27+
import { Http } from './Http';
28+
import { MosaicRepository } from './MosaicRepository';
2929

3030
/**
3131
* Mosaic http repository.

‎src/infrastructure/MultisigHttp.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
import {from as observableFrom, Observable, throwError} from 'rxjs';
18-
import {catchError, map, mergeMap} from 'rxjs/operators';
19-
import {Address} from '../model/account/Address';
20-
import {MultisigAccountGraphInfo} from '../model/account/MultisigAccountGraphInfo';
21-
import {MultisigAccountInfo} from '../model/account/MultisigAccountInfo';
22-
import {PublicAccount} from '../model/account/PublicAccount';
17+
import { MultisigRoutesApi } from 'nem2-sdk-openapi-typescript-node-client';
18+
import { from as observableFrom, Observable, throwError } from 'rxjs';
19+
import { catchError, map, mergeMap } from 'rxjs/operators';
20+
import { Address } from '../model/account/Address';
21+
import { MultisigAccountGraphInfo } from '../model/account/MultisigAccountGraphInfo';
22+
import { MultisigAccountInfo } from '../model/account/MultisigAccountInfo';
23+
import { PublicAccount } from '../model/account/PublicAccount';
2324
import { NetworkType } from '../model/blockchain/NetworkType';
24-
import { MultisigRoutesApi } from './api/multisigRoutesApi';
25-
import {Http} from './Http';
25+
import { Http } from './Http';
2626
import { MultisigRepository } from './MultisigRepository';
2727

2828
/**

0 commit comments

Comments
 (0)