refactor: removed unused attributes from jsonrpc

HathorNetwork · Jul 29, 2024 · 9f86c56 · 9f86c56
1 parent 4ca637f
commit 9f86c56
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 27 deletions.
diff --git a/packages/hathor-rpc-handler/jest.config.js b/packages/hathor-rpc-handler/jest.config.js
@@ -1,6 +1,6 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 
-export default {
+module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   testPathIgnorePatterns: ['<rootDir>/__tests__/mocks/']

diff --git a/packages/hathor-rpc-handler/src/index.ts b/packages/hathor-rpc-handler/src/index.ts
@@ -5,7 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-export * from './rpcHandler';
 export * from './types';
-export * from './rpcMethods';
 export * from './errors';
+export * from './rpcHandler';
+export * from './rpcMethods';
+export * from './rpcRequest';
diff --git a/packages/hathor-rpc-handler/src/rpcRequest/sendNanoContractTx.ts b/packages/hathor-rpc-handler/src/rpcRequest/sendNanoContractTx.ts
@@ -11,23 +11,23 @@ import {
   SendNanoContractRpcRequest,
 } from '../types';
 
-export function sendNanoContractTx(
+export function sendNanoContractTxRpcRequest(
   method: string,
   blueprintId: string,
   actions: NanoContractAction[],
   args: unknown[],
   pushTx: boolean,
   ncId: string | null,
-): Omit<SendNanoContractRpcRequest, 'id' | 'jsonrpc'> {
+): SendNanoContractRpcRequest {
   return {
     method: RpcMethods.SendNanoContractTx,
     params: {
       method,
       blueprint_id: blueprintId,
-      nc_id: ncId,
       actions,
       args,
       push_tx: pushTx,
+      nc_id: ncId,
     }
   };
 }
diff --git a/packages/hathor-rpc-handler/src/rpcRequest/signOracleData.ts b/packages/hathor-rpc-handler/src/rpcRequest/signOracleData.ts
@@ -10,11 +10,11 @@ import {
   SignOracleDataRpcRequest,
 } from '../types';
 
-export function signOracleData(
+export function signOracleDataRpcRequest(
   network: string,
   data: string,
   oracle: string,
-): Omit<SignOracleDataRpcRequest, 'id' | 'jsonrpc'> {
+): SignOracleDataRpcRequest {
   return {
     method: RpcMethods.SignOracleData,
     params: {

diff --git a/packages/hathor-rpc-handler/src/rpcRequest/signWithAddress.ts b/packages/hathor-rpc-handler/src/rpcRequest/signWithAddress.ts
@@ -10,11 +10,11 @@ import {
   SignWithAddressRpcRequest,
 } from '../types';
 
-export function signWithAddress(
+export function signWithAddressRpcRequest(
   network: string,
   message: string,
   addressIndex: number,
-): Omit<SignWithAddressRpcRequest, 'id' | 'jsonrpc'> {
+): SignWithAddressRpcRequest {
   return {
     method: RpcMethods.SignWithAddress,
     params: {

diff --git a/packages/hathor-rpc-handler/src/types/rpcRequest.ts b/packages/hathor-rpc-handler/src/types/rpcRequest.ts
@@ -20,13 +20,7 @@ export enum RpcMethods {
   SignOracleData = 'htr_signOracleData',
 }
 
-export interface BaseRpcRequest {
-  method: string;
-  id: string;
-  jsonrpc: string;
-}
-
-export interface GetAddressRpcRequest extends BaseRpcRequest {
+export interface GetAddressRpcRequest {
   method: RpcMethods.GetAddress,
   params: {
     type: 'first_empty' | 'full_path' | 'index' | 'client';
@@ -36,7 +30,7 @@ export interface GetAddressRpcRequest extends BaseRpcRequest {
   }
 }
 
-export interface GetBalanceRpcRequest extends BaseRpcRequest {
+export interface GetBalanceRpcRequest {
   method: RpcMethods.GetBalance,
   params: {
     network: string;
@@ -45,7 +39,7 @@ export interface GetBalanceRpcRequest extends BaseRpcRequest {
   };
 }
 
-export interface GetUtxosRpcRequest extends BaseRpcRequest {
+export interface GetUtxosRpcRequest {
   method: RpcMethods.GetUtxos,
   params: {
     network: string;
@@ -60,7 +54,7 @@ export interface GetUtxosRpcRequest extends BaseRpcRequest {
   };
 }
 
-export interface SignOracleDataRpcRequest extends BaseRpcRequest {
+export interface SignOracleDataRpcRequest {
   method: RpcMethods.SignOracleData,
   params: {
     network: string;
@@ -69,7 +63,7 @@ export interface SignOracleDataRpcRequest extends BaseRpcRequest {
   }
 }
 
-export interface SignWithAddressRpcRequest extends BaseRpcRequest {
+export interface SignWithAddressRpcRequest {
   method: RpcMethods.SignWithAddress,
   params: {
     network: string;
@@ -87,7 +81,7 @@ export interface QueryUtxosFilters {
   authorities?: number | null;
 }
 
-export interface SignOracleData extends BaseRpcRequest {
+export interface SignOracleData {
   method: RpcMethods.SignOracleData,
   params: {
     network: string;
@@ -96,7 +90,7 @@ export interface SignOracleData extends BaseRpcRequest {
   }
 }
 
-export interface SendNanoContractRpcRequest extends BaseRpcRequest {
+export interface SendNanoContractRpcRequest {
   method: RpcMethods.SendNanoContractTx,
   params: {
     method: string;
@@ -112,11 +106,12 @@ export type RequestMetadata = {
   [key: string]: string,
 };
 
-export interface GetConnectedNetworkRpcRequest extends BaseRpcRequest {
+export interface GetConnectedNetworkRpcRequest {
   method: RpcMethods.GetConnectedNetwork,
 }
 
-export interface GenericRpcRequest extends BaseRpcRequest {
+export interface GenericRpcRequest {
+  method: string;
   params?: unknown | null;
 }
 
@@ -125,4 +120,6 @@ export type RpcRequest =
   | GetBalanceRpcRequest
   | GetUtxosRpcRequest
   | SignWithAddressRpcRequest
-  | GenericRpcRequest;
+  | GenericRpcRequest
+  | SendNanoContractRpcRequest
+  | SignOracleDataRpcRequest;
diff --git a/packages/hathor-rpc-handler/tsconfig.json b/packages/hathor-rpc-handler/tsconfig.json
@@ -9,7 +9,8 @@
     "forceConsistentCasingInFileNames": true,
     "outDir": "./dist",
     "rootDir": "./src/",
-    "types": ["node", "jest"]
+    "types": ["node", "jest"],
+    "declaration": true
   },
   "exclude": [
     "__tests__/",