refactor(api): fixes any types usages (#77)

akash-network · Apr 22, 2024 · 9dd6a0e · 9dd6a0e
1 parent 7cefd8f
commit 9dd6a0e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/src/certificates/index.ts b/src/certificates/index.ts
@@ -1,6 +1,6 @@
 import { create as create509, pems } from "./generate509";
 import { SigningStargateClient } from "@cosmjs/stargate";
-import { messages as stargateMessages } from "../stargate";
+import { Message as stargateMessages } from "../stargate";
 import { createStarGateMessage } from "../pbclient/pbclient";
 
 import { QueryCertificatesRequest, QueryCertificatesResponse, CertificateFilter } from "@akashnetwork/akash-api/akash/cert/v1beta3";
@@ -34,7 +34,7 @@ export async function createCertificate(bech32Address: string) {
 export async function revokeCertificate(owner: string, serial: string, client: SigningStargateClient) {
   const message = createStarGateMessage(stargateMessages.MsgRevokeCertificate, {
     id: {
-      owner: owner,
+      owner,
       serial
     }
   });

diff --git a/src/pbclient/pbclient.spec.ts b/src/pbclient/pbclient.spec.ts
@@ -1,13 +1,18 @@
 import { faker } from "@faker-js/faker";
 
 import { createAminoMessage } from "./pbclient";
-import { messages } from "../stargate";
+import { Message } from "../stargate";
+import { AminoMsg } from "cosmwasm";
 
 describe("createAminoMessage", () => {
   it("creates an amino message", () => {
-    const message = faker.helpers.arrayElement(Object.values(messages));
-    const messageBody = "messageBody";
+    const message = faker.helpers.arrayElement(Object.values(Message));
+    const messageBody: AminoMsg = {
+      type: faker.string.alpha(10),
+      value: faker.string.alpha(10)
+    };
     const result = createAminoMessage(message, messageBody);
+
     expect(result).toEqual({
       typeUrl: message,
       value: messageBody

diff --git a/src/pbclient/pbclient.ts b/src/pbclient/pbclient.ts
@@ -1,7 +1,8 @@
-import { messages } from "../stargate";
+import { Message } from "../stargate";
+import { AminoMsg } from "cosmwasm";
+import { MsgCreateCertificate, MsgRevokeCertificate } from "../protobuf/akash/cert/v1beta3/cert";
 
-// dynamically determine max gas
-const fee = {
+const FEE = {
   amount: [
     {
       denom: "uakt",
@@ -11,19 +12,25 @@ const fee = {
   gas: "100000"
 };
 
-export function createAminoMessage(message: messages, messageBody: any) {
+export function createAminoMessage(message: Message, messageBody: AminoMsg) {
   return {
     typeUrl: message,
     value: messageBody
   };
 }
 
-export function createStarGateMessage(message: messages, messageBody: any) {
+type WithoutType<T> = Omit<T, "$type">;
+type MessageTypes = {
+  [Message.MsgCreateCertificate]: WithoutType<MsgCreateCertificate>;
+  [Message.MsgRevokeCertificate]: Omit<WithoutType<MsgRevokeCertificate>, "id"> & { id: WithoutType<MsgRevokeCertificate["id"]> };
+};
+
+export function createStarGateMessage<T extends keyof MessageTypes>(message: T, messageBody: MessageTypes[T]) {
   return {
     message: {
       typeUrl: message,
       value: messageBody
     },
-    fee: fee
+    fee: FEE
   };
 }
diff --git a/src/stargate/index.ts b/src/stargate/index.ts
@@ -6,7 +6,7 @@ export const getAkashTypeRegistry: () => [string, MessageType<UnknownMessage>][]
 export const getTypeUrl: (type: MessageType) => string = type => `/${type.$type}`;
 
 /* TODO: this should be generated from the proto files */
-export enum messages {
+export enum Message {
   MsgCreateCertificate = "/akash.cert.v1beta3.MsgCreateCertificate",
   MsgRevokeCertificate = "/akash.cert.v1beta3.MsgRevokeCertificate",
   MsgCreateDeployment = "/akash.deployment.v1beta3.MsgCreateDeployment",