Force Log properties to be non-optional (#415).

ethers-io · Apr 4, 2020 · da412f6 · da412f6
1 parent 053a2d7
commit da412f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/packages/abstract-provider/src.ts/index.ts b/packages/abstract-provider/src.ts/index.ts
@@ -76,21 +76,19 @@ export interface BlockWithTransactions extends _Block {
 
 
 export interface Log {
-    blockNumber?: number;
-    blockHash?: string;
-    transactionIndex?: number;
+    blockNumber: number;
+    blockHash: string;
+    transactionIndex: number;
 
     removed: boolean;
 
-    transactionLogIndex?: number,
-
     address: string;
     data: string;
 
     topics: Array<string>;
 
-    transactionHash?: string;
-    logIndex?: number;
+    transactionHash: string;
+    logIndex: number;
 }
 
 export interface TransactionReceipt {

diff --git a/packages/providers/src.ts/formatter.ts b/packages/providers/src.ts/formatter.ts
@@ -86,7 +86,6 @@ export class Formatter {
         };
 
         formats.receiptLog = {
-            transactionLogIndex: Formatter.allowNull(number),
             transactionIndex: number,
             blockNumber: number,
             transactionHash: hash,
@@ -381,18 +380,12 @@ export class Formatter {
     }
 
     receipt(value: any): TransactionReceipt {
-        //let status = transactionReceipt.status;
-        //let root = transactionReceipt.root;
-
         const result: TransactionReceipt = Formatter.check(this.formats.receipt, value);
-        result.logs.forEach((entry, index) => {
-            if (entry.transactionLogIndex == null) {
-                entry.transactionLogIndex = index;
-            }
-        });
+
         if (value.status != null) {
             result.byzantium = true;
         }
+
         return result;
     }