[worker] setShieldingKey internally when it is fetched

encointer · Apr 11, 2024 · 90b7b25 · 90b7b25
1 parent 0eb6c7b
commit 90b7b25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/worker-api/src/integriteeWorker.ts b/packages/worker-api/src/integriteeWorker.ts
@@ -45,11 +45,10 @@ export class IntegriteeWorker extends Worker {
         return this.sendTrustedCall(call, shard, options);
     }
 
-    async sendTrustedCall(call: IntegriteeTrustedCallSigned, shard: ShardIdentifier, options: CallOptions = {} as CallOptions):  Promise<Hash> {
+    async sendTrustedCall(call: IntegriteeTrustedCallSigned, shard: ShardIdentifier, options: CallOptions = {} as CallOptions): Promise<Hash> {
         if (this.shieldingKey() == undefined) {
-            const key = await this.getShieldingKey(options);
             console.log(`Setting the shielding pubKey of the worker.`)
-            this.setShieldingKey(key);
+            await this.getShieldingKey(options);
         }
 
         return sendTrustedCall<Hash>(this, call, shard, true, 'TrustedOperationResult', options);

diff --git a/packages/worker-api/src/worker.ts b/packages/worker-api/src/worker.ts
@@ -148,7 +148,9 @@ export class Worker extends WebSocketAsPromised implements IWorker {
   }
 
   public async getShieldingKey(options: CallOptions = {} as CallOptions): Promise<NodeRSA> {
-    return await callGetter<NodeRSA>(this, [Request.Worker, 'author_getShieldingKey', 'NodeRSA'], {}, options)
+    const key = await callGetter<NodeRSA>(this, [Request.Worker, 'author_getShieldingKey', 'NodeRSA'], {}, options)
+    this.setShieldingKey(key);
+    return key;
   }
 
   public async getShardVault(options: CallOptions = {} as CallOptions): Promise<Vault> {