Merge pull request #16 from oasisprotocol/pro-wh/feature/common

explode common
oasisprotocol · Feb 26, 2021 · fd36732 · fd36732
2 parents 41e46ee + fe2c700
commit fd36732
Show file tree

Hide file tree

Showing 4 changed files with 288 additions and 288 deletions.
diff --git a/client-sdk/ts-web/core/src/common.ts b/client-sdk/ts-web/core/src/common.ts
@@ -71,17 +71,17 @@ export const IDENTITY_MODULE_NAME = 'identity';
 export const CODE_CERTIFICATE_ROTATION_FORBIDDEN = 1;
 
 export async function openSignedEntity(context: string, signed: types.SignatureSigned) {
-    return misc.fromCBOR(await signature.openSigned(context, signed)) as types.CommonEntity;
+    return misc.fromCBOR(await signature.openSigned(context, signed)) as types.Entity;
 }
 
-export async function signSignedEntity(signer: signature.ContextSigner, context: string, entity: types.CommonEntity) {
+export async function signSignedEntity(signer: signature.ContextSigner, context: string, entity: types.Entity) {
     return await signature.signSigned(signer, context, misc.toCBOR(entity));
 }
 
 export async function openMultiSignedNode(context: string, multiSigned: types.SignatureMultiSigned) {
-    return misc.fromCBOR(await signature.openMultiSigned(context, multiSigned)) as types.CommonNode;
+    return misc.fromCBOR(await signature.openMultiSigned(context, multiSigned)) as types.Node;
 }
 
-export async function signMultiSignedNode(signers: signature.ContextSigner[], context: string, node: types.CommonNode) {
+export async function signMultiSignedNode(signers: signature.ContextSigner[], context: string, node: types.Node) {
     return await signature.signMultiSigned(signers, context, misc.toCBOR(node));
 }
diff --git a/client-sdk/ts-web/core/src/index.ts b/client-sdk/ts-web/core/src/index.ts
@@ -67,12 +67,12 @@ const methodDescriptorSchedulerConsensusParameters = createMethodDescriptorUnary
 const methodDescriptorSchedulerWatchCommittees = createMethodDescriptorServerStreaming<void, types.SchedulerCommittee>('Scheduler', 'WatchCommittees');
 
 // registry
-const methodDescriptorRegistryGetEntity = createMethodDescriptorUnary<types.RegistryIDQuery, types.CommonEntity>('Registry', 'GetEntity');
-const methodDescriptorRegistryGetEntities = createMethodDescriptorUnary<types.longnum, types.CommonEntity[]>('Registry', 'GetEntities');
-const methodDescriptorRegistryGetNode = createMethodDescriptorUnary<types.RegistryIDQuery, types.CommonNode>('Registry', 'GetNode');
-const methodDescriptorRegistryGetNodeByConsensusAddress = createMethodDescriptorUnary<types.RegistryConsensusAddressQuery, types.CommonNode>('Registry', 'GetNodeByConsensusAddress');
-const methodDescriptorRegistryGetNodeStatus = createMethodDescriptorUnary<types.RegistryIDQuery, types.CommonNode>('Registry', 'GetNodeStatus');
-const methodDescriptorRegistryGetNodes = createMethodDescriptorUnary<types.longnum, types.CommonNode[]>('Registry', 'GetNodes');
+const methodDescriptorRegistryGetEntity = createMethodDescriptorUnary<types.RegistryIDQuery, types.Entity>('Registry', 'GetEntity');
+const methodDescriptorRegistryGetEntities = createMethodDescriptorUnary<types.longnum, types.Entity[]>('Registry', 'GetEntities');
+const methodDescriptorRegistryGetNode = createMethodDescriptorUnary<types.RegistryIDQuery, types.Node>('Registry', 'GetNode');
+const methodDescriptorRegistryGetNodeByConsensusAddress = createMethodDescriptorUnary<types.RegistryConsensusAddressQuery, types.Node>('Registry', 'GetNodeByConsensusAddress');
+const methodDescriptorRegistryGetNodeStatus = createMethodDescriptorUnary<types.RegistryIDQuery, types.Node>('Registry', 'GetNodeStatus');
+const methodDescriptorRegistryGetNodes = createMethodDescriptorUnary<types.longnum, types.Node[]>('Registry', 'GetNodes');
 const methodDescriptorRegistryGetRuntime = createMethodDescriptorUnary<types.RegistryNamespaceQuery, types.RegistryRuntime>('Registry', 'GetRuntime');
 const methodDescriptorRegistryGetRuntimes = createMethodDescriptorUnary<types.RegistryGetRuntimesQuery, types.RegistryRuntime[]>('Registry', 'GetRuntimes');
 const methodDescriptorRegistryStateToGenesis = createMethodDescriptorUnary<types.longnum, types.RegistryGenesis>('Registry', 'StateToGenesis');

diff --git a/client-sdk/ts-web/core/src/signature.ts b/client-sdk/ts-web/core/src/signature.ts
@@ -68,7 +68,7 @@ export async function openMultiSigned(context: string, multiSigned: types.Signat
 }
 
 export async function signMultiSigned(signers: ContextSigner[], context: string, rawValue: Uint8Array) {
-    const signatures = [] as types.SignatureSignature[];
+    const signatures = [] as types.Signature[];
     for (const signer of signers) {
         signatures.push({
             public_key: signer.public(),