Remove validateResponse

eternauta1337 · May 2, 2024 · fba5e1a · fba5e1a
1 parent 191f721
commit fba5e1a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 40 deletions.
diff --git a/packages/ethernaut-retropgf/src/internal/agora/Agora.js b/packages/ethernaut-retropgf/src/internal/agora/Agora.js
@@ -31,7 +31,12 @@ class Agora {
     return this.createRequest('/spec')
   }
 
-  async createRequest(endpoint, method = 'GET', body = {}) {
+  async createRequest(
+    endpoint,
+    method = 'GET',
+    body = {},
+    successStatus = 200,
+  ) {
     const url = `${BASE_URL}${endpoint}`
 
     debug.log(`Requesting ${url}`, 'retropgf')
@@ -48,7 +53,7 @@ class Agora {
 
     const response = await axios(config)
 
-    if (response.status !== 200) {
+    if (response.status !== successStatus) {
       throw new EthernautCliError(
         'ethernaut-retropgf',
         `Http status error: ${response.status}`,

diff --git a/packages/ethernaut-retropgf/src/internal/agora/Auth.js b/packages/ethernaut-retropgf/src/internal/agora/Auth.js
@@ -1,5 +1,3 @@
-const { validateResponse } = require('./validate')
-
 class Auth {
   constructor(agora) {
     this.agora = agora
@@ -10,17 +8,10 @@ class Auth {
   }
 
   async verify({ message, signature }) {
-    await this.agora.createRequest('/auth/verify', 'POST', {
+    return this.agora.createRequest('/auth/verify', 'POST', {
       message,
       signature,
     })
-
-    // TODO: Fix validation
-    // validateResponse(
-    //   response,
-    //   200,
-    //   `Error verifying user: ${JSON.stringify(response, null, 2)}`,
-    // )
   }
 }
 

diff --git a/packages/ethernaut-retropgf/src/internal/agora/RetroFunding.js b/packages/ethernaut-retropgf/src/internal/agora/RetroFunding.js
@@ -1,5 +1,3 @@
-const { validateResponse } = require('./validate')
-
 class RetroFunding {
   constructor(agora) {
     this.agora = agora
@@ -30,7 +28,7 @@ class RetroFunding {
     ballotContent,
     signature,
   }) {
-    const response = await this.agora.createRequest(
+    return this.agora.createRequest(
       `/retrofunding/rounds/${roundId}/ballots/${ballotCasterAddressOrEns}/submit`,
       'POST',
       {
@@ -39,8 +37,6 @@ class RetroFunding {
         signature,
       },
     )
-
-    validateResponse(response, 200, `Error submitting ballot: ${response}`)
   }
 
   async roundProjects({ roundId, limit = 10, offset = 0 }) {
@@ -76,7 +72,7 @@ class RetroFunding {
     commenter,
     content,
   }) {
-    const response = await this.agora.createRequest(
+    return this.agora.createRequest(
       `/retrofunding/rounds/${roundId}/impactMetrics/${impactMetricId}/comments`,
       'PUT',
       {
@@ -85,21 +81,13 @@ class RetroFunding {
         content,
       },
     )
-
-    validateResponse(
-      response,
-      200,
-      `Error commenting on impact metric: ${response}`,
-    )
   }
 
   async deleteImpactMetricComment({ roundId, impactMetricId, commentId }) {
-    const response = await this.agora.createRequest(
+    return this.agora.createRequest(
       `/retrofunding/rounds/${roundId}/impactMetrics/${impactMetricId}/comments/${commentId}`,
       'DELETE',
     )
-
-    validateResponse(response, 200, `Error deleting comment: ${response}`)
   }
 
   async ballotImpactMetrics({
@@ -121,29 +109,26 @@ class RetroFunding {
     impactMetricId,
     allocationAmount,
   }) {
-    const response = await this.agora.createRequest(
+    return this.agora.createRequest(
       `/retrofunding/rounds/${roundId}/ballots/${ballotCasterAddressOrEns}/impactMetrics`,
       'POST',
       {
         impactMetricId,
         allocationAmount,
       },
+      201,
     )
-
-    validateResponse(response, 201, `Error creating impact metric: ${response}`)
   }
 
   async deleteImpactMetric({
     roundId,
     ballotCasterAddressOrEns,
     impactMetricId,
   }) {
-    const response = await this.agora.createRequest(
+    return this.agora.createRequest(
       `/retrofunding/rounds/${roundId}/ballots/${ballotCasterAddressOrEns}/impactMetrics/${impactMetricId}`,
       'DELETE',
     )
-
-    validateResponse(response, 200, `Error deleting impact metric: ${response}`)
   }
 }
 

diff --git a/packages/ethernaut-retropgf/src/internal/agora/validate.js b/packages/ethernaut-retropgf/src/internal/agora/validate.js
@@ -9,13 +9,6 @@ function validateSort(sort, types) {
   }
 }
 
-function validateResponse(received, expected, message) {
-  if (received !== expected) {
-    throw new EthernautCliError('retropgf', message)
-  }
-}
-
 module.exports = {
   validateSort,
-  validateResponse,
 }