Merge pull request #411 from oasisprotocol/pro-wh/bugfix/types

ts-web/core: minor types sync
oasisprotocol · Sep 7, 2021 · 338fb0d · 338fb0d
2 parents bf3d54d + 7f127b6
commit 338fb0d
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/client-sdk/ts-web/core/src/types.ts b/client-sdk/ts-web/core/src/types.ts
@@ -7,14 +7,6 @@ export type NotModeled = {[key: string]: unknown};
  */
 export type longnum = number | bigint;
 
-/**
- * EpochTimeState is the epoch state.
- */
-export interface BeaconEpochTimeState {
-    epoch: longnum;
-    height: longnum;
-}
-
 /**
  * ConsensusParameters are the beacon consensus parameters.
  */
@@ -41,6 +33,14 @@ export interface BeaconConsensusParameters {
     pvss_parameters?: BeaconPVSSParameters;
 }
 
+/**
+ * EpochTimeState is the epoch state.
+ */
+export interface BeaconEpochTimeState {
+    epoch: longnum;
+    height: longnum;
+}
+
 /**
  * Genesis is the beacon genesis state.
  */
@@ -1046,6 +1046,20 @@ export interface NodeConsensusInfo {
     addresses: NodeConsensusAddress[];
 }
 
+/**
+ * P2PInfo contains information for connecting to this node via P2P transport.
+ */
+export interface NodeP2PInfo {
+    /**
+     * ID is the unique identifier of the node on the P2P transport.
+     */
+    id: Uint8Array;
+    /**
+     * Addresses is the list of addresses at which the node can be reached.
+     */
+    addresses: NodeAddress[];
+}
+
 /**
  * Runtime represents the runtimes supported by a given Oasis node.
  */
@@ -1106,20 +1120,6 @@ export interface NodeTLSInfo {
     addresses: NodeTLSAddress[];
 }
 
-/**
- * P2PInfo contains information for connecting to this node via P2P transport.
- */
-export interface NodeP2PInfo {
-    /**
-     * ID is the unique identifier of the node on the P2P transport.
-     */
-    id: Uint8Array;
-    /**
-     * Addresses is the list of addresses at which the node can be reached.
-     */
-    addresses: NodeAddress[];
-}
-
 /**
  * Commit is a PVSS commit.
  */
@@ -1964,7 +1964,7 @@ export interface RootHashPool {
      * ExecuteCommitments are the commitments in the pool iff Committee.Kind
      * is scheduler.KindComputeExecutor.
      */
-    execute_commitments?: Map<Uint8Array, RootHashComputeBody>;
+    execute_commitments?: Map<Uint8Array, SignatureSigned>;
     /**
      * Discrepancy is a flag signalling that a discrepancy has been detected.
      */