refactor: merge WalletData and DelegateData (#475)

ArkEcosystemArchive · Jun 23, 2020 · 9788bc7 · 9788bc7
1 parent ec50150
commit 9788bc7
Show file tree

Hide file tree

Showing 57 changed files with 209 additions and 359 deletions.
diff --git a/.yarn/build-state.yml b/.yarn/build-state.yml
@@ -2,49 +2,37 @@
 # cause all your builds to become invalidated.
 
 # bcrypto@npm:4.3.2
-"36dfeed24f678b739be2dc4aeb0758f1a822d0c9932dcde9497f1d3feda2835f23ecf4d8752f27de47f30523ba2cf325e3bf8047e8beb2d8454b8742bee907c3":
-  c398a029b9cd887c38276a200bf760e2ea3c21ef725ac386358248ecb6e75df3351b9bb52f6e15cac4d8e9ea963818c73529fb161d0b41b31e873be330a1b6d5
+"36dfeed24f678b739be2dc4aeb0758f1a822d0c9932dcde9497f1d3feda2835f23ecf4d8752f27de47f30523ba2cf325e3bf8047e8beb2d8454b8742bee907c3": c398a029b9cd887c38276a200bf760e2ea3c21ef725ac386358248ecb6e75df3351b9bb52f6e15cac4d8e9ea963818c73529fb161d0b41b31e873be330a1b6d5
 
 # bcrypto@npm:5.2.0
-"2fca13eaee5dbfea710f72fc3af34b3de0a5985299e62164df6711ed1c71fbb66d3b3372f4e67787a9ac681d2ad1a0e9b24857296d3e9c18b9211a258efd0bb2":
-  556da142377feb98f6f70c69cf5e5ba3bb670ad5b4cda1d1289923a93b6fda5a4661fa36640f89ce13dee33d66cbcfd4d63d661e46fe430a7f76947479a5475c
+"2fca13eaee5dbfea710f72fc3af34b3de0a5985299e62164df6711ed1c71fbb66d3b3372f4e67787a9ac681d2ad1a0e9b24857296d3e9c18b9211a258efd0bb2": 556da142377feb98f6f70c69cf5e5ba3bb670ad5b4cda1d1289923a93b6fda5a4661fa36640f89ce13dee33d66cbcfd4d63d661e46fe430a7f76947479a5475c
 
 # bstring@npm:0.3.9
-"91054b6d6c04ebf395afb088712f69a7ceb6f388f062c5abd398ff5b8719ad9c3296be153310112c2c35b315920e77d35df52917ef0ec6775fff148a7ec9453f":
-  b2ba0a84243366c18a2d962a26a8f5d55c8844bc13d1a1f8c15554f5821cf4938d663fc47158759aadde12b2aee42016ee6a9ce094fd98ec15ccf4acaa0c15ff
+"91054b6d6c04ebf395afb088712f69a7ceb6f388f062c5abd398ff5b8719ad9c3296be153310112c2c35b315920e77d35df52917ef0ec6775fff148a7ec9453f": b2ba0a84243366c18a2d962a26a8f5d55c8844bc13d1a1f8c15554f5821cf4938d663fc47158759aadde12b2aee42016ee6a9ce094fd98ec15ccf4acaa0c15ff
 
 # core-js@npm:2.6.11
-"15178ded27ab674ae2054269453d809bdb1d00b98392a34947b5d43ea7a5811e5674c2fda7d48bb653b24a3506b0a8aa126bbac861bdeba93438ec6c7efb2d9d":
-  308e4770aef633cbc2fe939e91c97df7d12673a91ca87069100f467f441980f31db1608fbb9e994c2e855ad15002bb957cc5cecf0f98c861a50d77665a5cebf9
+"15178ded27ab674ae2054269453d809bdb1d00b98392a34947b5d43ea7a5811e5674c2fda7d48bb653b24a3506b0a8aa126bbac861bdeba93438ec6c7efb2d9d": 308e4770aef633cbc2fe939e91c97df7d12673a91ca87069100f467f441980f31db1608fbb9e994c2e855ad15002bb957cc5cecf0f98c861a50d77665a5cebf9
 
 # keccak@npm:2.1.0
-"b36e31bfb39dd9034c3ef94b6dc64c450cc0c2c230b3d7f87198ca6e35d21ceb81076a92d5aedfa3c23742ef76453a77b4fdae126a529bb64c88ebba185aa82b":
-  7469e66b74c3a44ac72a52343b9d81f8def8585c30cf49b46ba607ef06dcd62700a6df2fe035cbf068c2dfebcf710ad81c44155b390268cd6b9f28cab9a57a59
+"b36e31bfb39dd9034c3ef94b6dc64c450cc0c2c230b3d7f87198ca6e35d21ceb81076a92d5aedfa3c23742ef76453a77b4fdae126a529bb64c88ebba185aa82b": 7469e66b74c3a44ac72a52343b9d81f8def8585c30cf49b46ba607ef06dcd62700a6df2fe035cbf068c2dfebcf710ad81c44155b390268cd6b9f28cab9a57a59
 
 # keytar@npm:6.0.1
-"c48236f8bc0b579d927c6d3351729c8ab0c88a9d1051c844580a0ba8def05cb9582a3c4ebb2a825ffba29a1c16b3f620ceb525721171aab55d25ae8598352dd2":
-  5831e49050d04432fbb293edb1923ad6aa5356fa6ff3acdafdc8d50083d57f0639151759068146d6bcd3c38098ed5c862f11c7b54889a4e89faab84b16f2b7ff
+"c48236f8bc0b579d927c6d3351729c8ab0c88a9d1051c844580a0ba8def05cb9582a3c4ebb2a825ffba29a1c16b3f620ceb525721171aab55d25ae8598352dd2": 5831e49050d04432fbb293edb1923ad6aa5356fa6ff3acdafdc8d50083d57f0639151759068146d6bcd3c38098ed5c862f11c7b54889a4e89faab84b16f2b7ff
 
 # secp256k1@npm:3.8.0
-"e2ef54940a998b00b8742766988bc2404b0f1e17460b5cd3403f069c7a4af0f6be68462f35aa847dde9afe17926c2505fed8d19c2c128ec9537f41d09dae2aae":
-  bb7ee17c4820ab7f71bcd6048a3e573de1528a27c02561dafdf3a78a407f55404b2aa89f0b34bdcd2596b91ea318d30644040c486117a72272c38bca722a80ba
+"e2ef54940a998b00b8742766988bc2404b0f1e17460b5cd3403f069c7a4af0f6be68462f35aa847dde9afe17926c2505fed8d19c2c128ec9537f41d09dae2aae": bb7ee17c4820ab7f71bcd6048a3e573de1528a27c02561dafdf3a78a407f55404b2aa89f0b34bdcd2596b91ea318d30644040c486117a72272c38bca722a80ba
 
 # sodium-native@npm:2.4.6
-"52fe54f97fc47b0c5180cbe7b14faea252f9ff2989e83ddcdc1a01e48379fbf14247e57aaaac8478d2254a0ef713c57ba0125884e7005400a2dcce0e6dc57093":
-  f540cb53af9fe664479576763b3d444bda9ca66c9c17575fbfc48ddb2ff90ba602bf7c97a88d9bf6d631ff2ca645e83c3cd301fb4b336225a34255cc9bfb5fda
+"52fe54f97fc47b0c5180cbe7b14faea252f9ff2989e83ddcdc1a01e48379fbf14247e57aaaac8478d2254a0ef713c57ba0125884e7005400a2dcce0e6dc57093": f540cb53af9fe664479576763b3d444bda9ca66c9c17575fbfc48ddb2ff90ba602bf7c97a88d9bf6d631ff2ca645e83c3cd301fb4b336225a34255cc9bfb5fda
 
 # sodium-native@npm:3.2.0
-"7853f2b242ede0f5b79390af1bb7d0722e17f97b8b5324c71df3e1efee4fd9bb09c727d61e33cc1a907de0a60db5be86ffc99f31fdd1330d4cc1583e5160ff28":
-  d829bfea1ac146dac9040bfef285fcf4637cb884baa45393ea30450e3e1bf8d3c580b3d8c55bbdfc05b20d3457c05a73b68474c0731803b495055bd995dd7dbe
+"7853f2b242ede0f5b79390af1bb7d0722e17f97b8b5324c71df3e1efee4fd9bb09c727d61e33cc1a907de0a60db5be86ffc99f31fdd1330d4cc1583e5160ff28": d829bfea1ac146dac9040bfef285fcf4637cb884baa45393ea30450e3e1bf8d3c580b3d8c55bbdfc05b20d3457c05a73b68474c0731803b495055bd995dd7dbe
 
 # tiny-secp256k1@npm:1.1.4
-"d56e37061b9e9308a71776fdaed9b384e7fafcc8bc486d3aee73b71e03b6485ee64841c864a7e2faf7eeef6a666ffb4eb2ce5840b59ef2299ed6344c81f78fcf":
-  93637380cc6395a20fbee79f0ce14df49a608a8c82ad24d27a217027be4b6840a3751a4844047c9d66fe796a5423a3713c56f5a12d7c45c83031cc05779c13db
+"d56e37061b9e9308a71776fdaed9b384e7fafcc8bc486d3aee73b71e03b6485ee64841c864a7e2faf7eeef6a666ffb4eb2ce5840b59ef2299ed6344c81f78fcf": 93637380cc6395a20fbee79f0ce14df49a608a8c82ad24d27a217027be4b6840a3751a4844047c9d66fe796a5423a3713c56f5a12d7c45c83031cc05779c13db
 
 # web3@npm:1.2.9
-"6a5450d2eb9ae9f5c523218a0f4e239046aebd5b13736592ae3434720a684e6637423d1a7868b0c2f69d1a1a86206bd222011f59975ea9ba8e984aad98a52e27":
-  a278ea887ecec3baecde0e606023343af0874a2fd0be9541d3fd88bfccf48bffc77354ca4aac9b23f4f1057b43dc442d614c501c731f7aba68df40fd05810cd5
+"6a5450d2eb9ae9f5c523218a0f4e239046aebd5b13736592ae3434720a684e6637423d1a7868b0c2f69d1a1a86206bd222011f59975ea9ba8e984aad98a52e27": a278ea887ecec3baecde0e606023343af0874a2fd0be9541d3fd88bfccf48bffc77354ca4aac9b23f4f1057b43dc442d614c501c731f7aba68df40fd05810cd5
 
 # websocket@npm:1.0.31
-"ad73f7eebffd9f95af03bcab3ac4e326aa5af480f9ee144d7c611f1121916e056e8fecbdc19b68cf5a41d2186c4861acdd4ec7e678f803a2cfb5b6a5f5ce7107":
-  a94e4451632a4375d6045b60a4cce6a5f00b3089a38b079060c3700967c054d045585e15faa57ee37eddc047d9fb604f9477d1b3ef736e42eacebd13b4ddeab6
+"ad73f7eebffd9f95af03bcab3ac4e326aa5af480f9ee144d7c611f1121916e056e8fecbdc19b68cf5a41d2186c4861acdd4ec7e678f803a2cfb5b6a5f5ce7107": a94e4451632a4375d6045b60a4cce6a5f00b3089a38b079060c3700967c054d045585e15faa57ee37eddc047d9fb604f9477d1b3ef736e42eacebd13b4ddeab6
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/packages/platform-sdk-ark/__tests__/services/client.test.ts b/packages/platform-sdk-ark/__tests__/services/client.test.ts
@@ -2,7 +2,7 @@ import "jest-extended";
 import nock from "nock";
 
 import { ClientService } from "../../src/services/client";
-import { DelegateData, TransactionData, WalletData } from "../../src/dto";
+import { TransactionData, WalletData } from "../../src/dto";
 import { createConfig } from "../helpers";
 
 let subject: ClientService;
@@ -74,7 +74,7 @@ describe("ClientService", function () {
 
 			const result = await subject.delegate("arkx");
 
-			expect(result).toBeInstanceOf(DelegateData);
+			expect(result).toBeInstanceOf(WalletData);
 		});
 	});
 
@@ -87,7 +87,7 @@ describe("ClientService", function () {
 			const result = await subject.delegates();
 
 			expect(result.data).toBeObject();
-			expect(result.data.first()).toBeInstanceOf(DelegateData);
+			expect(result.data.first()).toBeInstanceOf(WalletData);
 		});
 	});
 

diff --git a/packages/platform-sdk-ark/src/dto/delegate.ts b/packages/platform-sdk-ark/src/dto/delegate.ts
diff --git a/packages/platform-sdk-ark/src/dto/index.ts b/packages/platform-sdk-ark/src/dto/index.ts
@@ -1,4 +1,3 @@
-export * from "./delegate";
 export * from "./peer";
 export * from "./transaction";
 export * from "./wallet";
diff --git a/packages/platform-sdk-ark/src/dto/wallet.ts b/packages/platform-sdk-ark/src/dto/wallet.ts
@@ -17,4 +17,16 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall
 	public nonce(): BigNumber {
 		return BigNumber.make(this.data.nonce);
 	}
+
+	public username(): string | undefined {
+		return this.data.username;
+	}
+
+	public rank(): number | undefined {
+		return this.data.rank;
+	}
+
+	public votes(): BigNumber | undefined {
+		return BigNumber.make(this.data.votes);
+	}
 }
diff --git a/packages/platform-sdk-ark/src/services/client.ts b/packages/platform-sdk-ark/src/services/client.ts
@@ -2,7 +2,7 @@ import { Connection } from "@arkecosystem/client";
 import { Coins, Contracts } from "@arkecosystem/platform-sdk";
 import { Arr } from "@arkecosystem/platform-sdk-support";
 
-import { DelegateData, TransactionData, WalletData } from "../dto";
+import { TransactionData, WalletData } from "../dto";
 
 export class ClientService implements Contracts.ClientService {
 	readonly #http: Contracts.HttpClient;
@@ -67,20 +67,20 @@ export class ClientService implements Contracts.ClientService {
 		};
 	}
 
-	public async delegate(id: string): Promise<Contracts.DelegateData> {
+	public async delegate(id: string): Promise<Contracts.WalletData> {
 		const { body } = await this.#connection.api("delegates").get(id);
 
-		return new DelegateData(body.data);
+		return new WalletData(body.data);
 	}
 
 	public async delegates(
 		query?: Contracts.KeyValuePair,
-	): Promise<Contracts.CollectionResponse<Coins.DelegateDataCollection>> {
+	): Promise<Contracts.CollectionResponse<Coins.WalletDataCollection>> {
 		const { body } = await this.#connection.api("delegates").all(query);
 
 		return {
 			meta: this.createMetaPagination(body),
-			data: new Coins.DelegateDataCollection(body.data.map((wallet) => new DelegateData(wallet))),
+			data: new Coins.WalletDataCollection(body.data.map((wallet) => new WalletData(wallet))),
 		};
 	}
 

diff --git a/packages/platform-sdk-atom/src/dto/delegate.ts b/packages/platform-sdk-atom/src/dto/delegate.ts
diff --git a/packages/platform-sdk-atom/src/dto/index.ts b/packages/platform-sdk-atom/src/dto/index.ts
@@ -1,4 +1,3 @@
-export * from "./delegate";
 export * from "./peer";
 export * from "./transaction";
 export * from "./wallet";
diff --git a/packages/platform-sdk-atom/src/dto/wallet.ts b/packages/platform-sdk-atom/src/dto/wallet.ts
@@ -1,4 +1,4 @@
-import { Contracts, DTO } from "@arkecosystem/platform-sdk";
+import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk";
 import { BigNumber } from "@arkecosystem/platform-sdk-support";
 
 export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData {
@@ -17,4 +17,16 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall
 	public nonce(): BigNumber {
 		return BigNumber.make(this.data.sequence);
 	}
+
+	public username(): string | undefined {
+		throw new Exceptions.NotImplemented(this.constructor.name, "username");
+	}
+
+	public rank(): number | undefined {
+		throw new Exceptions.NotImplemented(this.constructor.name, "rank");
+	}
+
+	public votes(): BigNumber | undefined {
+		throw new Exceptions.NotImplemented(this.constructor.name, "votes");
+	}
 }
diff --git a/packages/platform-sdk-atom/src/services/client.ts b/packages/platform-sdk-atom/src/services/client.ts
@@ -99,13 +99,13 @@ export class ClientService implements Contracts.ClientService {
 		throw new Exceptions.NotImplemented(this.constructor.name, "wallets");
 	}
 
-	public async delegate(id: string): Promise<Contracts.DelegateData> {
+	public async delegate(id: string): Promise<Contracts.WalletData> {
 		throw new Exceptions.NotImplemented(this.constructor.name, "delegate");
 	}
 
 	public async delegates(
 		query?: Contracts.KeyValuePair,
-	): Promise<Contracts.CollectionResponse<Coins.DelegateDataCollection>> {
+	): Promise<Contracts.CollectionResponse<Coins.WalletDataCollection>> {
 		throw new Exceptions.NotImplemented(this.constructor.name, "delegates");
 	}
 

diff --git a/packages/platform-sdk-btc/src/dto/delegate.ts b/packages/platform-sdk-btc/src/dto/delegate.ts
diff --git a/packages/platform-sdk-btc/src/dto/index.ts b/packages/platform-sdk-btc/src/dto/index.ts
@@ -1,4 +1,3 @@
-export * from "./delegate";
 export * from "./peer";
 export * from "./transaction";
 export * from "./wallet";
diff --git a/packages/platform-sdk-btc/src/dto/wallet.ts b/packages/platform-sdk-btc/src/dto/wallet.ts
@@ -1,4 +1,4 @@
-import { Contracts, DTO } from "@arkecosystem/platform-sdk";
+import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk";
 import { BigNumber } from "@arkecosystem/platform-sdk-support";
 
 export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData {
@@ -17,4 +17,16 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall
 	public nonce(): BigNumber {
 		return BigNumber.ZERO;
 	}
+
+	public username(): string | undefined {
+		throw new Exceptions.NotImplemented(this.constructor.name, "username");
+	}
+
+	public rank(): number | undefined {
+		throw new Exceptions.NotImplemented(this.constructor.name, "rank");
+	}
+
+	public votes(): BigNumber | undefined {
+		throw new Exceptions.NotImplemented(this.constructor.name, "votes");
+	}
 }
diff --git a/packages/platform-sdk-btc/src/services/client.ts b/packages/platform-sdk-btc/src/services/client.ts
@@ -58,13 +58,13 @@ export class ClientService implements Contracts.ClientService {
 		throw new Exceptions.NotImplemented(this.constructor.name, "wallets");
 	}
 
-	public async delegate(id: string): Promise<Contracts.DelegateData> {
+	public async delegate(id: string): Promise<Contracts.WalletData> {
 		throw new Exceptions.NotImplemented(this.constructor.name, "delegate");
 	}
 
 	public async delegates(
 		query?: Contracts.KeyValuePair,
-	): Promise<Contracts.CollectionResponse<Coins.DelegateDataCollection>> {
+	): Promise<Contracts.CollectionResponse<Coins.WalletDataCollection>> {
 		throw new Exceptions.NotImplemented(this.constructor.name, "delegates");
 	}
 

diff --git a/packages/platform-sdk-eos/src/dto/delegate.ts b/packages/platform-sdk-eos/src/dto/delegate.ts
diff --git a/packages/platform-sdk-eos/src/dto/index.ts b/packages/platform-sdk-eos/src/dto/index.ts
@@ -1,4 +1,3 @@
-export * from "./delegate";
 export * from "./peer";
 export * from "./transaction";
 export * from "./wallet";
diff --git a/packages/platform-sdk-eos/src/dto/wallet.ts b/packages/platform-sdk-eos/src/dto/wallet.ts
@@ -1,4 +1,4 @@
-import { Contracts, DTO } from "@arkecosystem/platform-sdk";
+import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk";
 import { BigNumber } from "@arkecosystem/platform-sdk-support";
 
 export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData {
@@ -17,4 +17,16 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall
 	public nonce(): BigNumber {
 		return BigNumber.ZERO;
 	}
+
+	public username(): string | undefined {
+		throw new Exceptions.NotImplemented(this.constructor.name, "username");
+	}
+
+	public rank(): number | undefined {
+		throw new Exceptions.NotImplemented(this.constructor.name, "rank");
+	}
+
+	public votes(): BigNumber | undefined {
+		throw new Exceptions.NotImplemented(this.constructor.name, "votes");
+	}
 }
diff --git a/packages/platform-sdk-eos/src/services/client.ts b/packages/platform-sdk-eos/src/services/client.ts
@@ -58,13 +58,13 @@ export class ClientService implements Contracts.ClientService {
 		throw new Exceptions.NotImplemented(this.constructor.name, "wallets");
 	}
 
-	public async delegate(id: string): Promise<Contracts.DelegateData> {
+	public async delegate(id: string): Promise<Contracts.WalletData> {
 		throw new Exceptions.NotImplemented(this.constructor.name, "delegate");
 	}
 
 	public async delegates(
 		query?: Contracts.KeyValuePair,
-	): Promise<Contracts.CollectionResponse<Coins.DelegateDataCollection>> {
+	): Promise<Contracts.CollectionResponse<Coins.WalletDataCollection>> {
 		throw new Exceptions.NotImplemented(this.constructor.name, "delegates");
 	}
 

diff --git a/packages/platform-sdk-eth/src/dto/delegate.ts b/packages/platform-sdk-eth/src/dto/delegate.ts
diff --git a/packages/platform-sdk-eth/src/dto/index.ts b/packages/platform-sdk-eth/src/dto/index.ts
@@ -1,4 +1,3 @@
-export * from "./delegate";
 export * from "./peer";
 export * from "./transaction";
 export * from "./wallet";