fix: define interfaces in proper order

encointer · Oct 3, 2024 · a14e701 · a14e701
1 parent 7436d8b
commit a14e701
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/packages/worker-api/src/integriteeWorker.ts b/packages/worker-api/src/integriteeWorker.ts
@@ -8,11 +8,16 @@ import {
     type CallOptions,
     type ISubmittableGetter,
     Request,
-    type JsonRpcRequest,
+    type JsonRpcRequest, type TrustedGetterArgs,
 } from './interface.js';
 import {Worker} from "./worker.js";
 import {callGetter, sendTrustedCall, sendWorkerRequest} from './sendRequest.js';
-import {createGetterRpc, createTrustedCall, signTrustedCall, submittableGetter} from "./requests.js";
+import {
+    createGetterRpc,
+    createSignedGetter,
+    createTrustedCall,
+    signTrustedCall,
+} from "./requests.js";
 import bs58 from "bs58";
 import type {Signer} from "@polkadot/types/types";
 import type {AddressOrPair} from "@polkadot/api-base/types/submittable";
@@ -117,3 +122,10 @@ export class SubmittableGetter<W extends Worker, Type> implements ISubmittableGe
         return sendWorkerRequest(this.worker, rpc, this.returnType, options);
     }
 }
+
+export const submittableGetter = async <W extends Worker, T>(self: W, request: string, args: TrustedGetterArgs, returnType: string)=> {
+    const {shard, account} = args;
+    const shardT = self.createType('ShardIdentifier', bs58.decode(shard));
+    const signedGetter = await createSignedGetter(self, request, account)
+    return new SubmittableGetter<W, T>(self, shardT, signedGetter, returnType);
+}
diff --git a/packages/worker-api/src/requests.ts b/packages/worker-api/src/requests.ts
@@ -1,6 +1,4 @@
 import {createJsonRpcRequest, type IWorker, type PublicGetterArgs, type TrustedGetterArgs} from "./interface.js";
-import {SubmittableGetter} from "./integriteeWorker.js";
-import {Worker} from "./worker.js";
 import type {
     BalanceTransferArgs,
     BalanceUnshieldArgs,
@@ -33,13 +31,6 @@ export const clientRequestGetterRpc = (self: IWorker, request: string, args: Pub
     return createGetterRpc(self, g, shardT);
 }
 
-export const submittableGetter = async <W extends Worker, T>(self: W, request: string, args: TrustedGetterArgs, returnType: string)=> {
-    const {shard, account} = args;
-    const shardT = self.createType('ShardIdentifier', bs58.decode(shard));
-    const signedGetter = await createSignedGetter(self, request, account)
-    return new SubmittableGetter<W, T>(self, shardT, signedGetter, returnType);
-}
-
 export const clientRequestTrustedGetterRpc = async (self: IWorker, request: string, args: TrustedGetterArgs) => {
     const {shard, account} = args;
     const shardT = self.createType('ShardIdentifier', bs58.decode(shard));