Rename removeOwner to removeOwnerWithThreshold

Closes #118
safe-global · Aug 8, 2019 · a3891de · a3891de
1 parent 5c29093
commit a3891de
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/contracts/base/OwnerManager.sol b/contracts/base/OwnerManager.sol
@@ -71,7 +71,7 @@ contract OwnerManager is SelfAuthorized {
     /// @param prevOwner Owner that pointed to the owner to be removed in the linked list
     /// @param owner Owner address to be removed.
     /// @param _threshold New threshold.
-    function removeOwner(address prevOwner, address owner, uint256 _threshold)
+    function removeOwnerWithThreshold(address prevOwner, address owner, uint256 _threshold)
         public
         authorized
     {

diff --git a/test/gnosisSafeManagement.js b/test/gnosisSafeManagement.js
@@ -53,7 +53,7 @@ contract('GnosisSafe', function(accounts) {
         assert.deepEqual(await gnosisSafe.getOwners(), [accounts[1], lw.accounts[0], lw.accounts[1], lw.accounts[3]])
 
         // Remove owner and reduce threshold to 2
-        data = await gnosisSafe.contract.removeOwner.getData(lw.accounts[1], lw.accounts[3], 2)
+        data = await gnosisSafe.contract.removeOwnerWithThreshold.getData(lw.accounts[1], lw.accounts[3], 2)
         let removeTx = await safeUtils.executeTransaction(lw, gnosisSafe, 'remove owner and reduce threshold to 2', [lw.accounts[0], lw.accounts[1], lw.accounts[3]], gnosisSafe.address, 0, data, CALL, executor)
         assert.equal(utils.checkTxEvent(removeTx, 'RemovedOwner', gnosisSafe.address, true).args.owner, lw.accounts[3])
         assert.equal(utils.checkTxEvent(removeTx, 'ChangedThreshold', gnosisSafe.address, true).args.threshold.toNumber(), 2)
@@ -94,13 +94,13 @@ contract('GnosisSafe', function(accounts) {
         await safeUtils.executeTransaction(lw, gnosisSafe, 'replace with zero account', [lw.accounts[0], lw.accounts[1]], gnosisSafe.address, 0, data, CALL, executor, { fails: true})
 
         // Invalid owner removals
-        data = await gnosisSafe.contract.removeOwner.getData(sentinel, accounts[0], 1)
+        data = await gnosisSafe.contract.removeOwnerWithThreshold.getData(sentinel, accounts[0], 1)
         await safeUtils.executeTransaction(lw, gnosisSafe, 'remove non-owner', [lw.accounts[0], lw.accounts[1]], gnosisSafe.address, 0, data, CALL, executor, { fails: true})
 
-        data = await gnosisSafe.contract.removeOwner.getData(lw.accounts[2], sentinel, 1)
+        data = await gnosisSafe.contract.removeOwnerWithThreshold.getData(lw.accounts[2], sentinel, 1)
         await safeUtils.executeTransaction(lw, gnosisSafe, 'remove sentinel', [lw.accounts[0], lw.accounts[1]], gnosisSafe.address, 0, data, CALL, executor, { fails: true})
 
-        data = await gnosisSafe.contract.removeOwner.getData(accounts[1], zeroAcc, 1)
+        data = await gnosisSafe.contract.removeOwnerWithThreshold.getData(accounts[1], zeroAcc, 1)
         await safeUtils.executeTransaction(lw, gnosisSafe, 'remove with zero account', [lw.accounts[0], lw.accounts[1]], gnosisSafe.address, 0, data, CALL, executor, { fails: true})
 
         let executorDiff = await web3.eth.getBalance(executor) - executorBalance

diff --git a/test/gnosisSafeSignatureTypes.js b/test/gnosisSafeSignatureTypes.js
@@ -97,7 +97,7 @@ contract('GnosisSafe Without Refund', function(accounts) {
         assert.deepEqual(await gnosisSafe.getOwners(), [accounts[5], accounts[0], accounts[1], accounts[3]])
 
         // Remove owner and reduce threshold to 2
-        data = await gnosisSafe.contract.removeOwner.getData(accounts[1], accounts[3], 2)
+        data = await gnosisSafe.contract.removeOwnerWithThreshold.getData(accounts[1], accounts[3], 2)
         await executeTransaction('remove owner and reduce threshold to 2', [accounts[0], accounts[1], accounts[3]], gnosisSafe.address, 0, data, CALL)
         assert.deepEqual(await gnosisSafe.getOwners(), [accounts[5], accounts[0], accounts[1]])
     })

diff --git a/test/stateChannelModule.js b/test/stateChannelModule.js
@@ -101,7 +101,7 @@ contract('StateChannelModule', function(accounts) {
         assert.deepEqual(await gnosisSafe.getOwners(), [accounts[1], lw.accounts[0], lw.accounts[1], lw.accounts[3]])
 
         // Remove owner and reduce threshold to 2
-        data = await gnosisSafe.contract.removeOwner.getData(lw.accounts[1], lw.accounts[3], 2)
+        data = await gnosisSafe.contract.removeOwnerWithThreshold.getData(lw.accounts[1], lw.accounts[3], 2)
         await executeTransaction('remove owner and reduce threshold to 2', [lw.accounts[0], lw.accounts[1], lw.accounts[3]], gnosisSafe.address, 0, data, CALL)
         assert.deepEqual(await gnosisSafe.getOwners(), [accounts[1], lw.accounts[0], lw.accounts[1]])
         assert.equal(await gnosisSafe.getThreshold(), 2)