Skip to content

Commit 2c3cbf5

Browse files
authored
Changed usage of epochAdjustment back to number (#691)
* Changed usage of epochAdjustment back to number * Removed peer dependancy
1 parent bd72e13 commit 2c3cbf5

File tree

62 files changed

+90
-139
lines changed

Some content is hidden

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

62 files changed

+90
-139
lines changed

e2e/infrastructure/AccountHttp.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import { toArray, take } from 'rxjs/operators';
3838
import { deepEqual } from 'assert';
3939
import { Order } from '../../src/infrastructure/infrastructure';
4040
import { AccountOrderBy } from '../../src/infrastructure/searchCriteria/AccountOrderBy';
41-
import { Duration } from 'js-joda';
4241

4342
describe('AccountHttp', () => {
4443
const helper = new IntegrationTestHelper();
@@ -57,7 +56,7 @@ describe('AccountHttp', () => {
5756
let generationHash: string;
5857
let networkType: NetworkType;
5958

60-
const epochAdjustment = Duration.ofSeconds(1573430400);
59+
const epochAdjustment = 1573430400;
6160

6261
before(() => {
6362
return helper.start({ openListener: true }).then(() => {

e2e/infrastructure/BlockHttp.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import { take } from 'rxjs/operators';
3131
import { TransactionStatement } from '../../src/model/model';
3232
import { ReceiptPaginationStreamer } from '../../src/infrastructure/paginationStreamer/ReceiptPaginationStreamer';
3333
import { Order } from '../../src/infrastructure/infrastructure';
34-
import { Duration } from 'js-joda';
3534

3635
describe('BlockHttp', () => {
3736
const helper = new IntegrationTestHelper();
@@ -44,7 +43,7 @@ describe('BlockHttp', () => {
4443
let networkType: NetworkType;
4544
let transactionHash;
4645

47-
const epochAdjustment = Duration.ofSeconds(1573430400);
46+
const epochAdjustment = 1573430400;
4847

4948
before(() => {
5049
return helper.start({ openListener: true }).then(() => {

e2e/infrastructure/HashLockHttp.spec.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,10 @@ import { deepEqual } from 'assert';
3030
import { Order, HashLockPaginationStreamer } from '../../src/infrastructure/infrastructure';
3131
import { Mosaic } from '../../src/model/mosaic/Mosaic';
3232
import { LockFundsTransaction } from '../../src/model/transaction/LockFundsTransaction';
33-
import { ChronoUnit } from 'js-joda';
33+
import { ChronoUnit } from '@js-joda/core';
3434
import { SignedTransaction } from '../../src/model/transaction/SignedTransaction';
3535
import { UnresolvedMosaicId } from '../../src/model/mosaic/UnresolvedMosaicId';
3636
import { HashLockRepository } from '../../src/infrastructure/HashLockRepository';
37-
import { Duration } from 'js-joda';
3837

3938
describe('HashLockHttp', () => {
4039
const helper = new IntegrationTestHelper();
@@ -49,7 +48,7 @@ describe('HashLockHttp', () => {
4948
let generationHash: string;
5049
let networkType: NetworkType;
5150

52-
const epochAdjustment = Duration.ofSeconds(1573430400);
51+
const epochAdjustment = 1573430400;
5352

5453
before(() => {
5554
return helper.start({ openListener: true }).then(() => {

e2e/infrastructure/IntegrationTestHelper.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import { SignedTransaction } from '../../src/model/transaction/SignedTransaction
2929
import { Transaction } from '../../src/model/transaction/Transaction';
3030
import { UInt64 } from '../../src/model/UInt64';
3131
import { TransactionService } from '../../src/service/TransactionService';
32-
import { Duration } from 'js-joda';
3332

3433
export class IntegrationTestHelper {
3534
public apiUrl: string;
@@ -53,7 +52,7 @@ export class IntegrationTestHelper {
5352
public service = new BootstrapService();
5453
public config: StartParams;
5554
public startEachTime = true;
56-
public epochAdjustment: Duration;
55+
public epochAdjustment: number;
5756

5857
private async startBootstrapServer(): Promise<{ accounts: string[]; apiUrl: string }> {
5958
this.config = {

e2e/infrastructure/Listener.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616
import { assert, expect } from 'chai';
17-
import { ChronoUnit, Duration } from 'js-joda';
17+
import { ChronoUnit } from '@js-joda/core';
1818
import { filter, mergeMap } from 'rxjs/operators';
1919
import { TransactionRepository } from '../../src/infrastructure/TransactionRepository';
2020
import { Account } from '../../src/model/account/Account';
@@ -47,7 +47,7 @@ describe('Listener', () => {
4747
let networkType: NetworkType;
4848
let transactionRepository: TransactionRepository;
4949

50-
const epochAdjustment = Duration.ofSeconds(1573430400);
50+
const epochAdjustment = 1573430400;
5151

5252
before(() => {
5353
return helper.start({ openListener: true }).then(() => {

e2e/infrastructure/MetadataHttp.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import { MetadataType } from '../../src/model/model';
3636
import { Order, MetadataPaginationStreamer } from '../../src/infrastructure/infrastructure';
3737
import { deepEqual } from 'assert';
3838
import { take, toArray } from 'rxjs/operators';
39-
import { Duration } from 'js-joda';
4039

4140
describe('MetadataHttp', () => {
4241
const helper = new IntegrationTestHelper();
@@ -48,7 +47,7 @@ describe('MetadataHttp', () => {
4847
let networkType: NetworkType;
4948
let metadataRepository: MetadataRepository;
5049

51-
const epochAdjustment = Duration.ofSeconds(1573430400);
50+
const epochAdjustment = 1573430400;
5251

5352
before(() => {
5453
return helper.start({ openListener: true }).then(() => {

e2e/infrastructure/MosaicHttp.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import { MosaicPaginationStreamer } from '../../src/infrastructure/paginationStr
3333
import { toArray, take } from 'rxjs/operators';
3434
import { deepEqual } from 'assert';
3535
import { TransactionGroup } from '../../src/infrastructure/TransactionGroup';
36-
import { Duration } from 'js-joda';
3736

3837
describe('MosaicHttp', () => {
3938
let mosaicId: MosaicId;
@@ -45,7 +44,7 @@ describe('MosaicHttp', () => {
4544
const helper = new IntegrationTestHelper();
4645
let networkType: NetworkType;
4746

48-
const epochAdjustment = Duration.ofSeconds(1573430400);
47+
const epochAdjustment = 1573430400;
4948

5049
before(() => {
5150
return helper.start({ openListener: true }).then(() => {

e2e/infrastructure/MultisigAccounts.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
import { Duration } from 'js-joda';
1716
import { Account } from '../../src/model/account/Account';
1817
import { NetworkType } from '../../src/model/network/NetworkType';
1918
import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
@@ -30,7 +29,7 @@ describe('MultisigAccounts', () => {
3029
let generationHash: string;
3130
let networkType: NetworkType;
3231

33-
const epochAdjustment = Duration.ofSeconds(1573430400);
32+
const epochAdjustment = 1573430400;
3433

3534
before(() => {
3635
return helper.start({ openListener: true }).then(() => {

e2e/infrastructure/NamespaceHttp.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import { IntegrationTestHelper } from './IntegrationTestHelper';
2828
import { NamespacePaginationStreamer } from '../../src/infrastructure/paginationStreamer/NamespacePaginationStreamer';
2929
import { take, toArray } from 'rxjs/operators';
3030
import { Order } from '../../src/infrastructure/infrastructure';
31-
import { Duration } from 'js-joda';
3231

3332
describe('NamespaceHttp', () => {
3433
let defaultNamespaceId: NamespaceId;
@@ -38,7 +37,7 @@ describe('NamespaceHttp', () => {
3837
let generationHash: string;
3938
const helper = new IntegrationTestHelper();
4039

41-
const epochAdjustment = Duration.ofSeconds(1573430400);
40+
const epochAdjustment = 1573430400;
4241

4342
before(() => {
4443
return helper.start({ openListener: true }).then(() => {

e2e/infrastructure/RestrictionHttp.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import { UInt64 } from '../../src/model/UInt64';
3636
import { IntegrationTestHelper } from './IntegrationTestHelper';
3737
import { AddressRestrictionFlag } from '../../src/model/restriction/AddressRestrictionFlag';
3838
import { MosaicAddressRestriction } from '../../src/model/restriction/MosaicAddressRestriction';
39-
import { Duration } from 'js-joda';
4039

4140
describe('RestrictionHttp', () => {
4241
const helper = new IntegrationTestHelper();
@@ -49,7 +48,7 @@ describe('RestrictionHttp', () => {
4948
let mosaicId: MosaicId;
5049
let referenceMosaicId: MosaicId;
5150
let restrictionAccountRepository: RestrictionAccountRepository;
52-
const epochAdjustment = Duration.ofSeconds(1573430400);
51+
const epochAdjustment = 1573430400;
5352

5453
before(() => {
5554
return helper.start({ openListener: true }).then(() => {

0 commit comments

Comments
 (0)