From de57b2691eac34e8805e15df626fb4afbca149f9 Mon Sep 17 00:00:00 2001
From: Franck Royer <franck@status.im>
Date: Mon, 3 May 2021 15:54:40 +1000
Subject: [PATCH] Only the `result` property is ever used

---
 src/test_utils/nim_waku.ts | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/test_utils/nim_waku.ts b/src/test_utils/nim_waku.ts
index b345087f2c..6136517112 100644
--- a/src/test_utils/nim_waku.ts
+++ b/src/test_utils/nim_waku.ts
@@ -137,20 +137,13 @@ export class NimWaku {
   async peers(): Promise<string[]> {
     this.checkProcess();
 
-    const res = await this.rpcCall<string[]>('get_waku_v2_admin_v1_peers', []);
-
-    return res.result;
+    return this.rpcCall<string[]>('get_waku_v2_admin_v1_peers', []);
   }
 
   async info(): Promise<RpcInfoResponse> {
     this.checkProcess();
 
-    const res = await this.rpcCall<RpcInfoResponse>(
-      'get_waku_v2_debug_v1_info',
-      []
-    );
-
-    return res.result;
+    return this.rpcCall<RpcInfoResponse>('get_waku_v2_debug_v1_info', []);
   }
 
   async sendMessage(message: WakuMessage): Promise<boolean> {
@@ -165,23 +158,18 @@ export class NimWaku {
       contentTopic: message.contentTopic,
     };
 
-    const res = await this.rpcCall<boolean>('post_waku_v2_relay_v1_message', [
+    return this.rpcCall<boolean>('post_waku_v2_relay_v1_message', [
       RelayDefaultTopic,
       rpcMessage,
     ]);
-
-    return res.result;
   }
 
   async messages(): Promise<WakuMessage[]> {
     this.checkProcess();
 
-    const res = await this.rpcCall<WakuMessage[]>(
-      'get_waku_v2_relay_v1_messages',
-      [RelayDefaultTopic]
-    );
-
-    return res.result;
+    return this.rpcCall<WakuMessage[]>('get_waku_v2_relay_v1_messages', [
+      RelayDefaultTopic,
+    ]);
   }
 
   async getPeerId(): Promise<PeerId> {
@@ -220,7 +208,7 @@ export class NimWaku {
   private async rpcCall<T>(
     method: string,
     params: Array<string | number | unknown>
-  ): Promise<{ result: T }> {
+  ): Promise<T> {
     const res = await axios.post(
       this.rpcUrl,
       {
@@ -234,7 +222,7 @@ export class NimWaku {
       }
     );
 
-    return res.data;
+    return res.data.result;
   }
 
   private checkProcess(): void {