Pass Converting functions to request()

* pass converting function on calling request.
* Convert data in BTP extension constructors.

Author: Inwon Kim

lib/IconService.ts

@@ -499,7 +499,7 @@ export default class IconService {
     const requestId = Util.getCurrentTime();
     const request = new Request(requestId, "btp_getNetworkInfo", params);
 
-    return this.provider.request<BTPNetworkInfo>(request);
+    return this.provider.request(request, (data) => new BTPNetworkInfo(data));
   }
 
   /** *
@@ -519,7 +519,10 @@ export default class IconService {
     const requestId = Util.getCurrentTime();
     const request = new Request(requestId, "btp_getNetworkTypeInfo", params);
 
-    return this.provider.request<BTPNetworkTypeInfo>(request);
+    return this.provider.request(
+      request,
+      (data) => new BTPNetworkTypeInfo(data)
+    );
   }
 
   /** *
@@ -577,7 +580,10 @@ export default class IconService {
   btpGetSourceInformation(): HttpCall<BTPSourceInformation> {
     const requestId = Util.getCurrentTime();
     const request = new Request(requestId, "btp_getSourceInformation", null);
-    return this.provider.request<BTPSourceInformation>(request);
+    return this.provider.request(
+      request,
+      (data) => new BTPSourceInformation(data)
+    );
   }
 
   /**

lib/data/Converter.ts

@@ -158,6 +158,14 @@ export function toHex(value: Hash): string {
   throw error.toString();
 }
 
+export function toBoolean(value: Hash): boolean {
+  const n = toBigNumber(value).toNumber();
+  if (n === 1) return true;
+  if (n === 0) return false;
+  const error = new DataError("Invalid value");
+  throw error.toString();
+}
+
 /**
  * Convert transaction object to raw transaction object.
  * @param {object} transaction - the transaction object.

lib/data/Formatter/BTPNetworkInfo.ts

@@ -15,6 +15,7 @@
  */
 
 import BigNumber from "bignumber.js";
+import { toBigNumber, toBoolean } from "../Converter";
 
 export default class BTPNetworkInfo {
   startHeight: BigNumber;
@@ -27,25 +28,28 @@ export default class BTPNetworkInfo {
 
   networkName: string;
 
-  open: BigNumber;
+  open: boolean;
+
+  owner: string;
 
   nextMessageSN: BigNumber;
 
-  nextProofContextChanged: BigNumber;
+  nextProofContextChanged: boolean;
 
   prevNSHash: string;
 
   lastNSHash: string;
 
   constructor(data) {
-    this.startHeight = data.startHeight;
-    this.networkTypeID = data.networkTypeID;
+    this.startHeight = toBigNumber(data.startHeight);
+    this.networkTypeID = toBigNumber(data.networkTypeID);
     this.networkTypeName = data.networkTypeName;
-    this.networkID = data.networkID;
+    this.networkID = toBigNumber(data.networkID);
     this.networkName = data.networkName;
-    this.open = data.open;
-    this.nextMessageSN = data.nextMessageSN;
-    this.nextProofContextChanged = data.nextProofContextChanged;
+    this.open = toBoolean(data.open);
+    this.owner = data.owner;
+    this.nextMessageSN = toBigNumber(data.nextMessageSN);
+    this.nextProofContextChanged = toBoolean(data.nextProofContextChanged);
     this.prevNSHash = data.prevNSHash;
     this.lastNSHash = data.lastNSHash;
   }

lib/data/Formatter/BTPNetworkTypeInfo.ts

@@ -15,6 +15,7 @@
  */
 
 import BigNumber from "bignumber.js";
+import { toBigNumber } from "../Converter";
 
 export default class BTPNetworkTypeInfo {
   networkTypeID: BigNumber;
@@ -26,9 +27,11 @@ export default class BTPNetworkTypeInfo {
   nextProofContext: string;
 
   constructor(data) {
-    this.networkTypeID = data.networkTypeID;
+    this.networkTypeID = toBigNumber(data.networkTypeID);
     this.networkTypeName = data.networkTypeName;
-    this.openNetworkIDs = data.openNetworkIDs;
+    this.openNetworkIDs = (data.openNetworkIDs || []).map((openNetworkID) =>
+      toBigNumber(openNetworkID)
+    );
     this.nextProofContext = data.nextProofContext;
   }
 }

lib/data/Formatter/BTPSourceInformation.ts

@@ -15,6 +15,7 @@
  */
 
 import BigNumber from "bignumber.js";
+import { toBigNumber } from "../Converter";
 
 export default class BTPSourceInformation {
   srcNetworkUID: string;
@@ -23,6 +24,8 @@ export default class BTPSourceInformation {
 
   constructor(data) {
     this.srcNetworkUID = data.srcNetworkUID;
-    this.networkTypeIDs = data.networkTypeIDs;
+    this.networkTypeIDs = (data.networkTypeIDs || []).map((networkTypeID) =>
+      toBigNumber(networkTypeID)
+    );
   }
 }