From d417c7499a9228b8459e5f3cab4fe6ec0d79fe0f Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <tyera@solana.com>
Date: Fri, 28 Feb 2020 15:08:27 -0800
Subject: [PATCH] fix: update feeCalculator layout

---
 web3.js/module.d.ts                          | 5 -----
 web3.js/module.flow.js                       | 5 -----
 web3.js/src/connection.js                    | 5 -----
 web3.js/src/fee-calculator.js                | 4 ----
 web3.js/test/mockrpc/get-recent-blockhash.js | 5 -----
 5 files changed, 24 deletions(-)

diff --git a/web3.js/module.d.ts b/web3.js/module.d.ts
index 54e8e3b87..7bbad19d9 100644
--- a/web3.js/module.d.ts
+++ b/web3.js/module.d.ts
@@ -23,12 +23,7 @@ declare module '@solana/web3.js' {
 
   // === src/fee-calculator.js ===
   export type FeeCalculator = {
-    burnPercent: number;
     lamportsPerSignature: number;
-    maxLamportsPerSignature: number;
-    minLamportsPerSignature: number;
-    targetLamportsPerSignature: number;
-    targetSignaturesPerSlot: number;
   };
 
   // === src/budget-program.js ===
diff --git a/web3.js/module.flow.js b/web3.js/module.flow.js
index cb2e62f17..55668275b 100644
--- a/web3.js/module.flow.js
+++ b/web3.js/module.flow.js
@@ -37,12 +37,7 @@ declare module '@solana/web3.js' {
 
   // === src/fee-calculator.js ===
   declare export type FeeCalculator = {
-    burnPercent: number,
     lamportsPerSignature: number,
-    maxLamportsPerSignature: number,
-    minLamportsPerSignature: number,
-    targetLamportsPerSignature: number,
-    targetSignaturesPerSlot: number,
   };
 
   // === src/budget-program.js ===
diff --git a/web3.js/src/connection.js b/web3.js/src/connection.js
index b15800b23..38f31d1b8 100644
--- a/web3.js/src/connection.js
+++ b/web3.js/src/connection.js
@@ -535,12 +535,7 @@ const GetRecentBlockhashAndContextRpcResult = jsonRpcResultAndContext(
   struct({
     blockhash: 'string',
     feeCalculator: struct({
-      burnPercent: 'number',
       lamportsPerSignature: 'number',
-      maxLamportsPerSignature: 'number',
-      minLamportsPerSignature: 'number',
-      targetLamportsPerSignature: 'number',
-      targetSignaturesPerSlot: 'number',
     }),
   }),
 );
diff --git a/web3.js/src/fee-calculator.js b/web3.js/src/fee-calculator.js
index dd3d14d8d..d72ab1f29 100644
--- a/web3.js/src/fee-calculator.js
+++ b/web3.js/src/fee-calculator.js
@@ -3,11 +3,7 @@
 /**
  * @typedef {Object} FeeCalculator
  * @property {number} lamportsPerSignature lamports Cost in lamports to validate a signature
- * @property {number} targetLamportsPerSignature
- * @property {number} targetSignaturesPerSlot
  */
 export type FeeCalculator = {
   lamportsPerSignature: number,
-  targetSignaturesPerSlot: number,
-  targetLamportsPerSignature: number,
 };
diff --git a/web3.js/test/mockrpc/get-recent-blockhash.js b/web3.js/test/mockrpc/get-recent-blockhash.js
index 6f686842e..23c7c316e 100644
--- a/web3.js/test/mockrpc/get-recent-blockhash.js
+++ b/web3.js/test/mockrpc/get-recent-blockhash.js
@@ -28,11 +28,6 @@ export function mockGetRecentBlockhash(commitment: ?Commitment) {
           blockhash: recentBlockhash.publicKey.toBase58(),
           feeCalculator: {
             lamportsPerSignature: 42,
-            burnPercent: 50,
-            maxLamportsPerSignature: 42,
-            minLamportsPerSignature: 42,
-            targetLamportsPerSignature: 42,
-            targetSignaturesPerSlot: 42,
           },
         },
       },