remove helper type per requested change on code review

trufflesuite · Feb 5, 2021 · 96a633a · 96a633a
1 parent d77e8d0
commit 96a633a
Show file tree

Hide file tree

Showing 17 changed files with 126 additions and 112 deletions.
diff --git a/src/chains/filecoin/filecoin/src/things/beacon-entry.ts b/src/chains/filecoin/filecoin/src/things/beacon-entry.ts
@@ -22,12 +22,10 @@ interface BeaconEntryConfig {
   };
 }
 
-type C = BeaconEntryConfig;
-
 class BeaconEntry
-  extends SerializableObject<C>
-  implements DeserializedObject<C> {
-  get config(): Definitions<C> {
+  extends SerializableObject<BeaconEntryConfig>
+  implements DeserializedObject<BeaconEntryConfig> {
+  get config(): Definitions<BeaconEntryConfig> {
     return {
       round: {
         deserializedName: "round",
@@ -46,7 +44,9 @@ class BeaconEntry
   }
 
   constructor(
-    options?: Partial<SerializedObject<C>> | Partial<DeserializedObject<C>>
+    options?:
+      | Partial<SerializedObject<BeaconEntryConfig>>
+      | Partial<DeserializedObject<BeaconEntryConfig>>
   ) {
     super();
 
@@ -58,6 +58,6 @@ class BeaconEntry
   data: Buffer;
 }
 
-type SerializedBeaconEntry = SerializedObject<C>;
+type SerializedBeaconEntry = SerializedObject<BeaconEntryConfig>;
 
 export { BeaconEntry, SerializedBeaconEntry };
diff --git a/src/chains/filecoin/filecoin/src/things/block-header.ts b/src/chains/filecoin/filecoin/src/things/block-header.ts
@@ -103,12 +103,10 @@ interface BlockHeaderConfig {
   };
 }
 
-type C = BlockHeaderConfig;
-
 class BlockHeader
-  extends SerializableObject<C>
-  implements DeserializedObject<C> {
-  get config(): Definitions<C> {
+  extends SerializableObject<BlockHeaderConfig>
+  implements DeserializedObject<BlockHeaderConfig> {
+  get config(): Definitions<BlockHeaderConfig> {
     return {
       miner: {
         deserializedName: "miner",
@@ -199,7 +197,9 @@ class BlockHeader
   }
 
   constructor(
-    options?: Partial<SerializedObject<C>> | Partial<DeserializedObject<C>>
+    options?:
+      | Partial<SerializedObject<BlockHeaderConfig>>
+      | Partial<DeserializedObject<BlockHeaderConfig>>
   ) {
     super();
 
@@ -286,6 +286,6 @@ class BlockHeader
   }
 }
 
-type SerializedBlockHeader = SerializedObject<C>;
+type SerializedBlockHeader = SerializedObject<BlockHeaderConfig>;
 
 export { BlockHeader, SerializedBlockHeader };
diff --git a/src/chains/filecoin/filecoin/src/things/channel-id.ts b/src/chains/filecoin/filecoin/src/things/channel-id.ts
@@ -27,10 +27,10 @@ type ChannelIDConfig = {
   };
 };
 
-type C = ChannelIDConfig;
-
-class ChannelID extends SerializableObject<C> implements DeserializedObject<C> {
-  get config(): Definitions<C> {
+class ChannelID
+  extends SerializableObject<ChannelIDConfig>
+  implements DeserializedObject<ChannelIDConfig> {
+  get config(): Definitions<ChannelIDConfig> {
     return {
       initiator: {
         deserializedName: "initiator",
@@ -51,7 +51,9 @@ class ChannelID extends SerializableObject<C> implements DeserializedObject<C> {
   }
 
   constructor(
-    options?: Partial<SerializedObject<C>> | Partial<DeserializedObject<C>>
+    options?:
+      | Partial<SerializedObject<ChannelIDConfig>>
+      | Partial<DeserializedObject<ChannelIDConfig>>
   ) {
     super();
 
@@ -65,6 +67,6 @@ class ChannelID extends SerializableObject<C> implements DeserializedObject<C> {
   id: number;
 }
 
-type SerializedChannelID = SerializedObject<C>;
+type SerializedChannelID = SerializedObject<ChannelIDConfig>;
 
 export { ChannelID, SerializedChannelID };
diff --git a/src/chains/filecoin/filecoin/src/things/data-transfer-channel.ts b/src/chains/filecoin/filecoin/src/things/data-transfer-channel.ts
@@ -58,12 +58,10 @@ type DataTransferChannelConfig = {
   };
 };
 
-type C = DataTransferChannelConfig;
-
 class DataTransferChannel
-  extends SerializableObject<C>
-  implements DeserializedObject<C> {
-  get config(): Definitions<C> {
+  extends SerializableObject<DataTransferChannelConfig>
+  implements DeserializedObject<DataTransferChannelConfig> {
+  get config(): Definitions<DataTransferChannelConfig> {
     return {
       transferId: {
         deserializedName: "transferId",
@@ -115,7 +113,9 @@ class DataTransferChannel
   }
 
   constructor(
-    options?: Partial<SerializedObject<C>> | Partial<DeserializedObject<C>>
+    options?:
+      | Partial<SerializedObject<DataTransferChannelConfig>>
+      | Partial<DeserializedObject<DataTransferChannelConfig>>
   ) {
     super();
 
@@ -141,6 +141,6 @@ class DataTransferChannel
   transferred: number;
 }
 
-type SerializedDataTransferChannel = SerializedObject<C>;
+type SerializedDataTransferChannel = SerializedObject<DataTransferChannelConfig>;
 
 export { DataTransferChannel, SerializedDataTransferChannel };
diff --git a/src/chains/filecoin/filecoin/src/things/deal-info.ts b/src/chains/filecoin/filecoin/src/things/deal-info.ts
@@ -96,10 +96,10 @@ type DealInfoConfig = {
   };
 };
 
-type C = DealInfoConfig;
-
-class DealInfo extends SerializableObject<C> implements DeserializedObject<C> {
-  get config(): Definitions<C> {
+class DealInfo
+  extends SerializableObject<DealInfoConfig>
+  implements DeserializedObject<DealInfoConfig> {
+  get config(): Definitions<DealInfoConfig> {
     return {
       proposalCid: {
         deserializedName: "proposalCid",
@@ -175,7 +175,9 @@ class DealInfo extends SerializableObject<C> implements DeserializedObject<C> {
   }
 
   constructor(
-    options?: Partial<SerializedObject<C>> | Partial<DeserializedObject<C>>
+    options?:
+      | Partial<SerializedObject<DealInfoConfig>>
+      | Partial<DeserializedObject<DealInfoConfig>>
   ) {
     super();
 
@@ -227,6 +229,6 @@ class DealInfo extends SerializableObject<C> implements DeserializedObject<C> {
   }
 }
 
-type SerializedDealInfo = SerializedObject<C>;
+type SerializedDealInfo = SerializedObject<DealInfoConfig>;
 
 export { DealInfo, SerializedDealInfo };
diff --git a/src/chains/filecoin/filecoin/src/things/election-proof.ts b/src/chains/filecoin/filecoin/src/things/election-proof.ts
@@ -22,12 +22,10 @@ interface ElectionProofConfig {
   };
 }
 
-type C = ElectionProofConfig;
-
 class ElectionProof
-  extends SerializableObject<C>
-  implements DeserializedObject<C> {
-  get config(): Definitions<C> {
+  extends SerializableObject<ElectionProofConfig>
+  implements DeserializedObject<ElectionProofConfig> {
+  get config(): Definitions<ElectionProofConfig> {
     return {
       winCount: {
         deserializedName: "winCount",
@@ -46,7 +44,9 @@ class ElectionProof
   }
 
   constructor(
-    options?: Partial<SerializedObject<C>> | Partial<DeserializedObject<C>>
+    options?:
+      | Partial<SerializedObject<ElectionProofConfig>>
+      | Partial<DeserializedObject<ElectionProofConfig>>
   ) {
     super();
 
@@ -58,6 +58,6 @@ class ElectionProof
   vrfProof: Buffer;
 }
 
-type SerializedElectionProof = SerializedObject<C>;
+type SerializedElectionProof = SerializedObject<ElectionProofConfig>;
 
 export { ElectionProof, SerializedElectionProof };
diff --git a/src/chains/filecoin/filecoin/src/things/head-change.ts b/src/chains/filecoin/filecoin/src/things/head-change.ts
@@ -23,12 +23,10 @@ interface HeadChangeConfig {
   };
 }
 
-type C = HeadChangeConfig;
-
 class HeadChange
-  extends SerializableObject<C>
-  implements DeserializedObject<C> {
-  get config(): Definitions<C> {
+  extends SerializableObject<HeadChangeConfig>
+  implements DeserializedObject<HeadChangeConfig> {
+  get config(): Definitions<HeadChangeConfig> {
     return {
       type: {
         deserializedName: "type",
@@ -44,7 +42,9 @@ class HeadChange
   }
 
   constructor(
-    options?: Partial<SerializedObject<C>> | Partial<DeserializedObject<C>>
+    options?:
+      | Partial<SerializedObject<HeadChangeConfig>>
+      | Partial<DeserializedObject<HeadChangeConfig>>
   ) {
     super();
 
@@ -56,7 +56,7 @@ class HeadChange
   val: Tipset;
 }
 
-type SerializedHeadChange = SerializedObject<C>;
+type SerializedHeadChange = SerializedObject<HeadChangeConfig>;
 
 // Retrieved these from https://git.io/Jtvke
 export enum HeadChangeType {

diff --git a/src/chains/filecoin/filecoin/src/things/post-proof.ts b/src/chains/filecoin/filecoin/src/things/post-proof.ts
@@ -22,10 +22,10 @@ interface PoStProofConfig {
   };
 }
 
-type C = PoStProofConfig;
-
-class PoStProof extends SerializableObject<C> implements DeserializedObject<C> {
-  get config(): Definitions<C> {
+class PoStProof
+  extends SerializableObject<PoStProofConfig>
+  implements DeserializedObject<PoStProofConfig> {
+  get config(): Definitions<PoStProofConfig> {
     return {
       postProof: {
         deserializedName: "postProof",
@@ -44,7 +44,9 @@ class PoStProof extends SerializableObject<C> implements DeserializedObject<C> {
   }
 
   constructor(
-    options?: Partial<SerializedObject<C>> | Partial<DeserializedObject<C>>
+    options?:
+      | Partial<SerializedObject<PoStProofConfig>>
+      | Partial<DeserializedObject<PoStProofConfig>>
   ) {
     super();
 
@@ -56,6 +58,6 @@ class PoStProof extends SerializableObject<C> implements DeserializedObject<C> {
   proofBytes: Buffer;
 }
 
-type SerializedPoStProof = SerializedObject<C>;
+type SerializedPoStProof = SerializedObject<PoStProofConfig>;
 
 export { PoStProof, SerializedPoStProof };
diff --git a/src/chains/filecoin/filecoin/src/things/query-offer.ts b/src/chains/filecoin/filecoin/src/things/query-offer.ts
@@ -64,12 +64,10 @@ type QueryOfferConfig = {
   };
 };
 
-type C = QueryOfferConfig;
-
 class QueryOffer
-  extends SerializableObject<C>
-  implements DeserializedObject<C> {
-  get config(): Definitions<C> {
+  extends SerializableObject<QueryOfferConfig>
+  implements DeserializedObject<QueryOfferConfig> {
+  get config(): Definitions<QueryOfferConfig> {
     return {
       err: {
         deserializedName: "err",
@@ -125,7 +123,9 @@ class QueryOffer
   }
 
   constructor(
-    options?: Partial<SerializedObject<C>> | Partial<DeserializedObject<C>>
+    options?:
+      | Partial<SerializedObject<QueryOfferConfig>>
+      | Partial<DeserializedObject<QueryOfferConfig>>
   ) {
     super();
 
@@ -159,6 +159,6 @@ class QueryOffer
   minerPeer: RetrievalPeer;
 }
 
-type SerializedQueryOffer = SerializedObject<C>;
+type SerializedQueryOffer = SerializedObject<QueryOfferConfig>;
 
 export { QueryOffer, SerializedQueryOffer };
diff --git a/src/chains/filecoin/filecoin/src/things/retrieval-order.ts b/src/chains/filecoin/filecoin/src/things/retrieval-order.ts
@@ -64,12 +64,10 @@ type RetrievalOrderConfig = {
   };
 };
 
-type C = RetrievalOrderConfig;
-
 class RetrievalOrder
-  extends SerializableObject<C>
-  implements DeserializedObject<C> {
-  get config(): Definitions<C> {
+  extends SerializableObject<RetrievalOrderConfig>
+  implements DeserializedObject<RetrievalOrderConfig> {
+  get config(): Definitions<RetrievalOrderConfig> {
     return {
       root: {
         deserializedName: "root",
@@ -125,7 +123,9 @@ class RetrievalOrder
   }
 
   constructor(
-    options?: Partial<SerializedObject<C>> | Partial<DeserializedObject<C>>
+    options?:
+      | Partial<SerializedObject<RetrievalOrderConfig>>
+      | Partial<DeserializedObject<RetrievalOrderConfig>>
   ) {
     super();
 
@@ -159,6 +159,6 @@ class RetrievalOrder
   minerPeer: RetrievalPeer;
 }
 
-type SerializedRetrievalOrder = SerializedObject<C>;
+type SerializedRetrievalOrder = SerializedObject<RetrievalOrderConfig>;
 
 export { RetrievalOrder, SerializedRetrievalOrder };
diff --git a/src/chains/filecoin/filecoin/src/things/retrieval-peer.ts b/src/chains/filecoin/filecoin/src/things/retrieval-peer.ts
@@ -28,12 +28,10 @@ type RetrievalPeerConfig = {
   };
 };
 
-type C = RetrievalPeerConfig;
-
 class RetrievalPeer
-  extends SerializableObject<C>
-  implements DeserializedObject<C> {
-  get config(): Definitions<C> {
+  extends SerializableObject<RetrievalPeerConfig>
+  implements DeserializedObject<RetrievalPeerConfig> {
+  get config(): Definitions<RetrievalPeerConfig> {
     return {
       address: {
         deserializedName: "address",
@@ -54,7 +52,9 @@ class RetrievalPeer
   }
 
   constructor(
-    options?: Partial<SerializedObject<C>> | Partial<DeserializedObject<C>>
+    options?:
+      | Partial<SerializedObject<RetrievalPeerConfig>>
+      | Partial<DeserializedObject<RetrievalPeerConfig>>
   ) {
     super();
 
@@ -68,6 +68,6 @@ class RetrievalPeer
   pieceCID: RootCID;
 }
 
-type SerializedRetrievalPeer = SerializedObject<C>;
+type SerializedRetrievalPeer = SerializedObject<RetrievalPeerConfig>;
 
 export { RetrievalPeer, SerializedRetrievalPeer };