Merge pull request #270 from nervosnetwork/update-type-of-epoch

feat(rpc): update the type of epoch
ckb-js · Jun 22, 2019 · 296c515 · 296c515
2 parents d4756c7 + 509a79b
commit 296c515
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 22 deletions.
diff --git a/packages/ckb-sdk-rpc/__tests__/formatters/result.json b/packages/ckb-sdk-rpc/__tests__/formatters/result.json
@@ -797,21 +797,17 @@
     "toEpoch": [
       {
         "source": {
-          "block_reward": "5000000000000",
+          "epoch_reward": "125000000000000",
           "difficulty": "0x100",
-          "last_block_hash_in_previous_epoch": "0x0000000000000000000000000000000000000000000000000000000000000000",
           "length": "1000",
           "number": "0",
-          "remainder_reward": "5000000000000",
           "start_number": "0"
         },
         "target": {
-          "blockReward": "5000000000000",
+          "epochReward": "125000000000000",
           "difficulty": "0x100",
-          "lastBlockHashInPreviousEpoch": "0x0000000000000000000000000000000000000000000000000000000000000000",
           "length": "1000",
           "number": "0",
-          "remainderReward": "5000000000000",
           "startNumber": "0"
         }
       }

diff --git a/packages/ckb-sdk-rpc/src/resultFormatter.ts b/packages/ckb-sdk-rpc/src/resultFormatter.ts
@@ -192,17 +192,9 @@ const formatter = {
   },
   toEpoch: (epoch: CKB_RPC.Epoch): CKBComponents.Epoch => {
     if (!epoch) return epoch
-    const {
-      block_reward: blockReward,
-      last_block_hash_in_previous_epoch: lastBlockHashInPreviousEpoch,
-      remainder_reward: remainderReward,
-      start_number: startNumber,
-      ...rest
-    } = epoch
+    const { epoch_reward: epochReward, start_number: startNumber, ...rest } = epoch
     return {
-      blockReward,
-      lastBlockHashInPreviousEpoch,
-      remainderReward,
+      epochReward,
       startNumber,
       ...rest,
     }

diff --git a/packages/ckb-sdk-rpc/types/CKB_RPC/index.d.ts b/packages/ckb-sdk-rpc/types/CKB_RPC/index.d.ts
@@ -169,12 +169,10 @@ declare module CKB_RPC {
   }
 
   export interface Epoch {
-    block_reward: string
+    epoch_reward: string
     difficulty: string
-    last_block_hash_in_previous_epoch: string
     length: string
     number: string
-    remainder_reward: string
     start_number: string
   }
 

diff --git a/packages/ckb-types/index.d.ts b/packages/ckb-types/index.d.ts
@@ -290,12 +290,10 @@ declare namespace CKBComponents {
   }
 
   export interface Epoch {
-    blockReward: String
+    epochReward: String
     difficulty: String
-    lastBlockHashInPreviousEpoch: String
     length: String
     number: String
-    remainderReward: String
     startNumber: String
   }