Skip to content
This repository has been archived by the owner on Jul 7, 2021. It is now read-only.

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Faust committed May 12, 2020
1 parent 892e752 commit cd53963
Show file tree
Hide file tree
Showing 47 changed files with 227 additions and 226 deletions.
8 changes: 4 additions & 4 deletions packages/platform-sdk-ark/__tests__/dto/transaction.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "jest-extended";
import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";

import { TransactionData } from "../../src/dto";
import Fixture from "../__fixtures__/client/transaction.json";
Expand All @@ -26,11 +26,11 @@ describe("TransactionData", function () {
});

test("#confirmations", () => {
expect(subject.confirmations()).toEqual(BigNumber.make(4636121));
expect(subject.confirmations()).toEqual(Utils.BigNumber.make(4636121));
});

test("#nonce", () => {
expect(subject.nonce()).toEqual(BigNumber.make(1));
expect(subject.nonce()).toEqual(Utils.BigNumber.make(1));
});

test("#sender", () => {
Expand All @@ -42,7 +42,7 @@ describe("TransactionData", function () {
});

test("#amount", () => {
expect(subject.amount()).toEqual(BigNumber.make("12500000000000000"));
expect(subject.amount()).toEqual(Utils.BigNumber.make("12500000000000000"));
});

test("#fee", () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/platform-sdk-ark/__tests__/dto/wallet.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "jest-extended";

import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";

import { WalletData } from "../../src/dto";
import Fixture from "../__fixtures__/client/wallet.json";
Expand All @@ -19,7 +19,7 @@ describe("WalletData", function () {
});

test("#balance", () => {
expect(subject.balance()).toEqual(BigNumber.make("55827093444556"));
expect(subject.balance()).toEqual(Utils.BigNumber.make("55827093444556"));
});

test("#toObject", () => {
Expand Down
22 changes: 11 additions & 11 deletions packages/platform-sdk-ark/src/dto/transaction.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Contracts, DTO } from "@arkecosystem/platform-sdk";
import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";

export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData {
public id(): string {
Expand All @@ -18,12 +18,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont
return this.data.timestamp.epoch;
}

public confirmations(): BigNumber {
return BigNumber.make(this.data.confirmations);
public confirmations(): Utils.BigNumber {
return Utils.BigNumber.make(this.data.confirmations);
}

public nonce(): BigNumber {
return BigNumber.make(this.data.nonce);
public nonce(): Utils.BigNumber {
return Utils.BigNumber.make(this.data.nonce);
}

public sender(): string {
Expand All @@ -34,19 +34,19 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont
return this.data.recipient;
}

public amount(): BigNumber {
public amount(): Utils.BigNumber {
if (this.data.typeGroup === 0 && this.data.type === 6) {
return this.data.asset.payments.reduce(
(sum: BigNumber, { amount }: { amount: string }) => sum.plus(amount),
BigNumber.ZERO,
(sum: Utils.BigNumber, { amount }: { amount: string }) => sum.add(amount),
Utils.BigNumber.ZERO,
);
}

return BigNumber.make(this.data.amount);
return Utils.BigNumber.make(this.data.amount);
}

public fee(): BigNumber {
return BigNumber.make(this.data.fee);
public fee(): Utils.BigNumber {
return Utils.BigNumber.make(this.data.fee);
}

public memo(): string | undefined {
Expand Down
10 changes: 5 additions & 5 deletions packages/platform-sdk-ark/src/dto/wallet.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Contracts, DTO } from "@arkecosystem/platform-sdk";
import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";

export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData {
public address(): string {
Expand All @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall
return this.data.publicKey;
}

public balance(): BigNumber {
return BigNumber.make(this.data.balance);
public balance(): Utils.BigNumber {
return Utils.BigNumber.make(this.data.balance);
}

public nonce(): BigNumber {
return BigNumber.make(this.data.nonce);
public nonce(): Utils.BigNumber {
return Utils.BigNumber.make(this.data.nonce);
}
}
6 changes: 3 additions & 3 deletions packages/platform-sdk-atom/__tests__/dto/transaction.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "jest-extended";

import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";

import { TransactionData } from "../../src/dto/transaction";
import Fixture from "../__fixtures__/client/transaction.json";
Expand All @@ -18,8 +18,8 @@ describe("TransactionData", function () {
expect(result.nonce()).toEqual(BigNumber.ZERO);
expect(result.sender()).toBe("cosmos1de7pk372jkp9vrul0gv5j6r3l9mt3wa6m4h6h0");
expect(result.recipient()).toBe("cosmos14ddvyl5t0hzmknceuv3zzu5szuum4rkygpq5ln");
expect(result.amount()).toEqual(BigNumber.make(10680));
expect(result.fee()).toEqual(BigNumber.make(36875));
expect(result.amount()).toEqual(Utils.BigNumber.make(10680));
expect(result.fee()).toEqual(Utils.BigNumber.make(36875));
expect(result.memo()).toBe("Hello World");
expect(result.blockId()).toBe("14990");
});
Expand Down
6 changes: 3 additions & 3 deletions packages/platform-sdk-atom/__tests__/dto/wallet.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "jest-extended";

import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";

import { WalletData } from "../../src/dto/wallet";
import Fixture from "../__fixtures__/client/wallet.json";
Expand All @@ -12,7 +12,7 @@ describe("WalletData", function () {
expect(result).toBeInstanceOf(WalletData);
expect(result.address()).toBe("cosmos1de7pk372jkp9vrul0gv5j6r3l9mt3wa6m4h6h0");
expect(result.publicKey()).toBe("Ap65s+Jdgo8BtvTbkc7GyUti8yJ7RpZ7cE1zCuKgNeXY");
expect(result.balance()).toEqual(BigNumber.make(69519574));
expect(result.nonce()).toEqual(BigNumber.make(24242));
expect(result.balance()).toEqual(Utils.BigNumber.make(69519574));
expect(result.nonce()).toEqual(Utils.BigNumber.make(24242));
});
});
14 changes: 7 additions & 7 deletions packages/platform-sdk-atom/__tests__/services/client.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "jest-extended";

import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";
import nock from "nock";

import { ClientService } from "../../src/services/client";
Expand Down Expand Up @@ -32,8 +32,8 @@ describe("ClientService", function () {
expect(result.nonce()).toEqual(BigNumber.ZERO);
expect(result.sender()).toBe("cosmos1de7pk372jkp9vrul0gv5j6r3l9mt3wa6m4h6h0");
expect(result.recipient()).toBe("cosmos14ddvyl5t0hzmknceuv3zzu5szuum4rkygpq5ln");
expect(result.amount()).toEqual(BigNumber.make(10680));
expect(result.fee()).toEqual(BigNumber.make(36875));
expect(result.amount()).toEqual(Utils.BigNumber.make(10680));
expect(result.fee()).toEqual(Utils.BigNumber.make(36875));
expect(result.memo()).toBe("Hello World");
expect(result.blockId()).toBe("14990");
});
Expand All @@ -59,8 +59,8 @@ describe("ClientService", function () {
expect(result.data[0].nonce()).toEqual(BigNumber.ZERO);
expect(result.data[0].sender()).toBe("cosmos1de7pk372jkp9vrul0gv5j6r3l9mt3wa6m4h6h0");
expect(result.data[0].recipient()).toBe("cosmos14ddvyl5t0hzmknceuv3zzu5szuum4rkygpq5ln");
expect(result.data[0].amount()).toEqual(BigNumber.make(10680));
expect(result.data[0].fee()).toEqual(BigNumber.make(36875));
expect(result.data[0].amount()).toEqual(Utils.BigNumber.make(10680));
expect(result.data[0].fee()).toEqual(Utils.BigNumber.make(36875));
expect(result.data[0].memo()).toBe("Hello World");
expect(result.data[0].blockId()).toBe("14990");
});
Expand All @@ -77,8 +77,8 @@ describe("ClientService", function () {
expect(result).toBeInstanceOf(WalletData);
expect(result.address()).toBe("cosmos1de7pk372jkp9vrul0gv5j6r3l9mt3wa6m4h6h0");
expect(result.publicKey()).toBe("Ap65s+Jdgo8BtvTbkc7GyUti8yJ7RpZ7cE1zCuKgNeXY");
expect(result.balance()).toEqual(BigNumber.make(69519574));
expect(result.nonce()).toEqual(BigNumber.make(24242));
expect(result.balance()).toEqual(Utils.BigNumber.make(69519574));
expect(result.nonce()).toEqual(Utils.BigNumber.make(24242));
});
});

Expand Down
18 changes: 9 additions & 9 deletions packages/platform-sdk-atom/src/dto/transaction.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Contracts, DTO } from "@arkecosystem/platform-sdk";
import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";

export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData {
public id(): string {
Expand All @@ -18,12 +18,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont
return +new Date(this.data.timestamp);
}

public confirmations(): BigNumber {
return BigNumber.ZERO;
public confirmations(): Utils.BigNumber {
return Utils.BigNumber.ZERO;
}

public nonce(): BigNumber {
return BigNumber.ZERO;
public nonce(): Utils.BigNumber {
return Utils.BigNumber.ZERO;
}

public sender(): string {
Expand All @@ -41,15 +41,15 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont
}

// @ts-ignore
public amount(): BigNumber {
public amount(): Utils.BigNumber {
const event = this.data.events.find((event) => event.type === "transfer");
const attribute = event.attributes.find((attribute) => attribute.key === "amount");

return BigNumber.make(attribute.value.replace(/\D/g, ""));
return Utils.BigNumber.make(attribute.value.replace(/\D/g, ""));
}

public fee(): BigNumber {
return BigNumber.make(this.data.gas_used);
public fee(): Utils.BigNumber {
return Utils.BigNumber.make(this.data.gas_used);
}

public memo(): string | undefined {
Expand Down
10 changes: 5 additions & 5 deletions packages/platform-sdk-atom/src/dto/wallet.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Contracts, DTO } from "@arkecosystem/platform-sdk";
import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";

export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData {
public address(): string {
Expand All @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall
return this.data.public_key.value;
}

public balance(): BigNumber {
return BigNumber.make(this.data.coins[0].amount.replace(/\D/g, ""));
public balance(): Utils.BigNumber {
return Utils.BigNumber.make(this.data.coins[0].amount.replace(/\D/g, ""));
}

public nonce(): BigNumber {
return BigNumber.make(this.data.sequence);
public nonce(): Utils.BigNumber {
return Utils.BigNumber.make(this.data.sequence);
}
}
8 changes: 4 additions & 4 deletions packages/platform-sdk-btc/__tests__/dto/transaction.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "jest-extended";

import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";

import { TransactionData } from "../../src/dto/transaction";
import Fixture from "../__fixtures__/client/transaction.json";
Expand All @@ -14,12 +14,12 @@ describe("TransactionData", function () {
expect(result.type()).toBeUndefined();
expect(result.typeGroup()).toBeUndefined();
expect(result.timestamp()).toBe(1561095453000);
expect(result.confirmations()).toEqual(BigNumber.make(159414));
expect(result.confirmations()).toEqual(Utils.BigNumber.make(159414));
expect(result.nonce()).toEqual(BigNumber.ZERO);
// expect(result.sender()).toBe("...");
// expect(result.recipient()).toBe("...");
expect(result.amount()).toEqual(BigNumber.make(3050000));
expect(result.fee()).toEqual(BigNumber.make(10000));
expect(result.amount()).toEqual(Utils.BigNumber.make(3050000));
expect(result.fee()).toEqual(Utils.BigNumber.make(10000));
expect(result.memo()).toBeUndefined();
expect(result.blockId()).toBe(1563778);
});
Expand Down
4 changes: 2 additions & 2 deletions packages/platform-sdk-btc/__tests__/dto/wallet.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "jest-extended";

import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";

import { WalletData } from "../../src/dto/wallet";
import Fixture from "../__fixtures__/client/wallet.json";
Expand All @@ -12,6 +12,6 @@ describe("WalletData", function () {
expect(result).toBeInstanceOf(WalletData);
expect(result.address()).toBe("my48EN4kDnGEpRZMBfiDS65wdfwfgCGZRz");
expect(result.publicKey()).toBe("76a914c05f53de525d80151e209a729cf1c7909c88f88e88ac");
expect(result.balance()).toEqual(BigNumber.make(3050000));
expect(result.balance()).toEqual(Utils.BigNumber.make(3050000));
});
});
10 changes: 5 additions & 5 deletions packages/platform-sdk-btc/__tests__/services/client.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "jest-extended";
import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";
import nock from "nock";

import { ClientService } from "../../src/services/client";
Expand Down Expand Up @@ -29,12 +29,12 @@ describe("ClientService", function () {
expect(result.type()).toBeUndefined();
expect(result.typeGroup()).toBeUndefined();
expect(result.timestamp()).toBe(1561095453000);
expect(result.confirmations()).toEqual(BigNumber.make(159414));
expect(result.confirmations()).toEqual(Utils.BigNumber.make(159414));
expect(result.nonce()).toEqual(BigNumber.ZERO);
// expect(result.sender()).toBe("...");
// expect(result.recipient()).toBe("...");
expect(result.amount()).toEqual(BigNumber.make(3050000));
expect(result.fee()).toEqual(BigNumber.make(10000));
expect(result.amount()).toEqual(Utils.BigNumber.make(3050000));
expect(result.fee()).toEqual(Utils.BigNumber.make(10000));
expect(result.memo()).toBeUndefined();
expect(result.blockId()).toBe(1563778);
});
Expand All @@ -51,7 +51,7 @@ describe("ClientService", function () {
expect(result).toBeInstanceOf(WalletData);
expect(result.address()).toBe("my48EN4kDnGEpRZMBfiDS65wdfwfgCGZRz");
expect(result.publicKey()).toBe("76a914c05f53de525d80151e209a729cf1c7909c88f88e88ac");
expect(result.balance()).toEqual(BigNumber.make(3050000));
expect(result.balance()).toEqual(Utils.BigNumber.make(3050000));
});
});

Expand Down
18 changes: 9 additions & 9 deletions packages/platform-sdk-btc/src/dto/transaction.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk";
import { BigNumber } from "@arkecosystem/utils";
import { Utils } from "@arkecosystem/platform-sdk";

export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData {
public id(): string {
Expand All @@ -18,12 +18,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont
return +new Date(this.data.blockTime);
}

public confirmations(): BigNumber {
return BigNumber.make(this.data.confirmations);
public confirmations(): Utils.BigNumber {
return Utils.BigNumber.make(this.data.confirmations);
}

public nonce(): BigNumber {
return BigNumber.ZERO;
public nonce(): Utils.BigNumber {
return Utils.BigNumber.ZERO;
}

public sender(): string {
Expand All @@ -34,12 +34,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont
throw new Exceptions.NotImplemented(this.constructor.name, "recipient");
}

public amount(): BigNumber {
return BigNumber.make(this.data.value);
public amount(): Utils.BigNumber {
return Utils.BigNumber.make(this.data.value);
}

public fee(): BigNumber {
return BigNumber.make(this.data.fee);
public fee(): Utils.BigNumber {
return Utils.BigNumber.make(this.data.fee);
}

public memo(): string | undefined {
Expand Down

0 comments on commit cd53963

Please sign in to comment.