Agreement: Update staking dependency (#1269)

* agreement: update staking dependency * agreement: update gas tests
aragon · Sep 11, 2020 · 809c639 · 809c639
1 parent c6f96e2
commit 809c639
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/apps/agreement/contracts/Agreement.sol b/apps/agreement/contracts/Agreement.sol
@@ -14,9 +14,9 @@ import "@aragon/os/contracts/lib/math/SafeMath.sol";
 import "@aragon/os/contracts/lib/math/SafeMath64.sol";
 import "@aragon/os/contracts/lib/token/ERC20.sol";
 
-import "@aragon/staking/interfaces/IStaking.sol";
-import "@aragon/staking/interfaces/IStakingFactory.sol";
-import "@aragon/staking/interfaces/ILockManager.sol";
+import "@aragon/staking/interfaces/0.4/IStaking.sol";
+import "@aragon/staking/interfaces/0.4/IStakingFactory.sol";
+import "@aragon/staking/interfaces/0.4/ILockManager.sol";
 
 import "./arbitration/IArbitrable.sol";
 import "./arbitration/IAragonAppFeesCashier.sol";
@@ -1132,7 +1132,7 @@ contract Agreement is IArbitrable, ILockManager, IAgreement, IACLOracle, AragonA
             return;
         }
 
-        _staking.lock(_user, address(this), _amount);
+        _staking.lock(_user, _amount);
     }
 
     /**

diff --git a/apps/agreement/package.json b/apps/agreement/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@aragon/os": "5.0.0-rc.0",
-    "@aragon/staking": "0.2.9"
+    "@aragon/staking": "0.3.1"
   },
   "devDependencies": {
     "@aragon/contract-helpers-test": "^0.1.0",

diff --git a/apps/agreement/test/agreement/agreement_gas_cost.js b/apps/agreement/test/agreement/agreement_gas_cost.js
@@ -18,27 +18,27 @@ contract('Agreement', ([_, user]) => {
     }
 
     context('stake', () => {
-      itCostsAtMost(205e3, () => disputable.stake({ user }))
+      itCostsAtMost(201e3, () => disputable.stake({ user }))
     })
 
     context('unstake', () => {
       beforeEach('stake', async () => {
         await disputable.stake({ user })
       })
 
-      itCostsAtMost(185e3, () => disputable.unstake({ user }))
+      itCostsAtMost(181e3, () => disputable.unstake({ user }))
     })
 
     context('newAction', () => {
-      itCostsAtMost(297e3, async () => (await disputable.newAction({})).receipt)
+      itCostsAtMost(293e3, async () => (await disputable.newAction({})).receipt)
     })
 
     context('closeAction', () => {
       beforeEach('submit action', async () => {
         ({ actionId } = await disputable.newAction({}))
       })
 
-      itCostsAtMost(86e3, () => disputable.close(actionId))
+      itCostsAtMost(81e3, () => disputable.close(actionId))
     })
 
     context('challenge', () => {
@@ -55,7 +55,7 @@ contract('Agreement', ([_, user]) => {
         await disputable.challenge({ actionId })
       })
 
-      itCostsAtMost(276e3, () => disputable.settle({ actionId }))
+      itCostsAtMost(272e3, () => disputable.settle({ actionId }))
     })
 
     context('dispute', () => {
@@ -83,7 +83,7 @@ contract('Agreement', ([_, user]) => {
       })
 
       context('in favor of the challenger', () => {
-        itCostsAtMost(445e3, () => disputable.executeRuling({ actionId, ruling: RULINGS.IN_FAVOR_OF_CHALLENGER }))
+        itCostsAtMost(415e3, () => disputable.executeRuling({ actionId, ruling: RULINGS.IN_FAVOR_OF_CHALLENGER }))
       })
     })
   })

diff --git a/apps/agreement/test/agreement/agreement_lock_manager.js b/apps/agreement/test/agreement/agreement_lock_manager.js
@@ -15,8 +15,8 @@ contract('Agreement', ([_, owner, submitter, challenger, someone]) => {
   describe('lock manager interface', () => {
     let actionId
 
-    context("can't unlock", () => {
-      const cannotUnlock = async (user) => {
+    context('can not unlock', () => {
+      const cannotUnlock = async () => {
         await Promise.all(
           [owner, submitter, challenger, someone].map(async (user) => {
             assert.isFalse(await agreement.canUnlock(user, 0), 'User can unlock')
@@ -34,7 +34,7 @@ contract('Agreement', ([_, owner, submitter, challenger, someone]) => {
         await cannotUnlock()
       })
 
-      it('after siging', async () => {
+      it('after signing', async () => {
         await disputable.sign(submitter)
         await cannotUnlock()
       })

diff --git a/apps/agreement/test/agreement/agreement_new_action.js b/apps/agreement/test/agreement/agreement_new_action.js
@@ -225,7 +225,7 @@ contract('Agreement', ([_, owner, submitter, someone]) => {
                         context('when the submitter has no allowed balance in the staking pool', () => {
                           beforeEach('decrease allowance', async () => {
                             const staking = await disputable.getStaking(collateralToken)
-                            const { _allowance: allowance, _amount: locked } = await staking.getLock(submitter, disputable.address)
+                            const { allowance, amount: locked } = await staking.getLock(submitter, disputable.address)
                             await staking.decreaseLockAllowance(submitter, disputable.address, allowance.sub(locked), { from: submitter })
                           })
 

diff --git a/apps/agreement/test/helpers/wrappers/agreement.js b/apps/agreement/test/helpers/wrappers/agreement.js
@@ -301,7 +301,7 @@ class AgreementWrapper {
 
   async allowManager({ token, user, amount }) {
     const staking = await this.getStaking(token)
-    const { _allowance: allowance, _amount: locked } = await staking.getLock(user, this.agreement.address)
+    const { allowance, amount: locked } = await staking.getLock(user, this.agreement.address)
     if (allowance.eq(bn(0))) {
       return staking.allowManager(this.agreement.address, amount, EMPTY_BYTES, { from: user })
     } else if (allowance.sub(locked).lt(amount)) {

diff --git a/apps/voting-disputable/package.json b/apps/voting-disputable/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "@aragon/minime": "1.0.0",
     "@aragon/os": "5.0.0-rc.0",
-    "@aragon/staking": "0.2.9"
+    "@aragon/staking": "0.3.1"
   },
   "devDependencies": {
     "@aragon/apps-agreement": "1.0.0-rc.0",

diff --git a/yarn.lock b/yarn.lock
@@ -30,10 +30,10 @@
   resolved "https://registry.yarnpkg.com/@aragon/os/-/os-5.0.0-rc.0.tgz#a4e68fc452aebf59b7976d7f763b71da714f4b2e"
   integrity sha512-jqSxL5f4k7fHT6EyROZCi8oXG1ZBzIXbaStfQFokhZVKtLN0yXayOz5WukVaHrllRUQLtWcrSAXHnx6P6WGLkA==
 
-"@aragon/staking@0.2.9":
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/@aragon/staking/-/staking-0.2.9.tgz#e678716757e771049797b86b44c76445c1aa2b1c"
-  integrity sha512-1KK4SsUTD4ZweZ+hLlDUvDoyY4CN8xiGo/ENe+OlMX/CcU3a3fHl0ix4uHaCzJ9gCJQGG65inxlml2lzFnmP9A==
+"@aragon/staking@0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@aragon/staking/-/staking-0.3.1.tgz#6dd33dfc98c6f6a0a8880561da39684187bb4d7d"
+  integrity sha512-W3dIwc43Vum9kFMI+op0SiEtWOp6mk/AhQsMPK0AHI53Ngzgn7lOPXg5IB+28fKpAjX7xWhMr9+Wok0zhZjfNw==
 
 "@aragon/truffle-config-v4@^1.0.1":
   version "1.0.1"