fix(arbitrable): return new contract from deploy

kleros · May 8, 2018 · 26ea105 · 26ea105
1 parent b581186
commit 26ea105
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/src/constants/error.js b/src/constants/error.js
@@ -5,6 +5,8 @@ export const MISSING_PARAMETERS = name => `Missing required parameter: ${name}`
 export const PROFILE_NOT_FOUND = user => `No profile found for user: ${user}.`
 export const NOTIFICATION_NOT_FOUND = txHash =>
   `No notification with txHash ${txHash} exists.`
+export const REQUEST_FAILED = error =>
+  `Request returned an error response: ${error}`
 
 // Contracts
 export const UNABLE_TO_DEPLOY_CONTRACT =

diff --git a/src/contracts/abstractions/Arbitrable.js b/src/contracts/abstractions/Arbitrable.js
@@ -47,7 +47,7 @@ class ArbitrableContract extends AbstractContract {
       ...args
     )
 
-    await this._StoreProvider.updateContract(
+    const newContract = await this._StoreProvider.updateContract(
       account,
       contractInstance.address,
       {
@@ -62,8 +62,7 @@ class ArbitrableContract extends AbstractContract {
       }
     )
 
-    // return contract data
-    return this.getData(contractInstance.address, account)
+    return newContract
   }
 
   /**

diff --git a/src/utils/StoreProviderWrapper.js b/src/utils/StoreProviderWrapper.js
@@ -242,7 +242,7 @@ class StoreProviderWrapper {
    * @param {object} params - Params we want to update.
    * @returns {Promise} - The resulting contract data.
    */
-  updateContract = (userAddress, contractAddress, params) => {
+  updateContract = async (userAddress, contractAddress, params) => {
     const getBodyFn = async () => {
       let currentContractData = await this.getContractByAddress(
         userAddress,
@@ -256,11 +256,20 @@ class StoreProviderWrapper {
       return JSON.stringify({ ...currentContractData, ...params })
     }
 
-    return this.queueWriteRequest(
+    const httpResponse = await this.queueWriteRequest(
       getBodyFn,
       'POST',
       `${this._storeUri}/${userAddress}/contracts/${contractAddress}`
     )
+
+    if (httpResponse.status !== 201) {
+      throw new Error(errorConstants.REQUEST_FAILED(httpResponse.error))
+    }
+
+    return _.filter(
+      httpResponse.body[0].contracts,
+      contract => contract.address === contractAddress
+    )[0]
   }
 
   /**
@@ -319,14 +328,14 @@ class StoreProviderWrapper {
     const getBodyFn = async () => {
       const userProfile = await this.getUserProfile(userAddress)
 
-      const disputeIndex = _.filter(
-        userProfile.disputes,
-        dispute =>
-          dispute.arbitratorAddress === arbitratorAddress &&
-          dispute.disputeId === disputeId
-      )
+      const currentDisputeProfile =
+        _.filter(
+          userProfile.disputes,
+          dispute =>
+            dispute.arbitratorAddress === arbitratorAddress &&
+            dispute.disputeId === disputeId
+        )[0] || {}
 
-      const currentDisputeProfile = userProfile.disputes[disputeIndex] || {}
       delete currentDisputeProfile._id
       // set these so if it is a new dispute they are included
       params.disputeId = disputeId