Merge pull request #113 from abhayks1/proxy_factory_refactor

ProxyFactory address refactoring from createCompanyWallet method
OpenST · Feb 20, 2019 · 7bd288b · 7bd288b
2 parents cc2e083 + 5687ad5
commit 7bd288b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/lib/helper/User.js b/lib/helper/User.js
@@ -312,26 +312,17 @@ class User {
    * Method for creation and configuration of token holder proxy contract for company
    * with hardware wallet as it's owner.
    *
-   * @param proxyFactory proxyFactory contract address.
    * @param owner TokenHolder proxy owner address. It could be hardware wallet address.
    * @param sessionKeys Session key addresses to authorize.
    * @param sessionKeysSpendingLimits Session key's spending limits.
    * @param sessionKeysExpirationHeights Session key's expiration heights.
    *
    * @returns Promise object.
    */
-  async createCompanyWallet(
-    proxyFactory,
-    owner,
-    sessionKeys,
-    sessionKeysSpendingLimits,
-    sessionKeysExpirationHeights,
-    txOptions
-  ) {
+  async createCompanyWallet(owner, sessionKeys, sessionKeysSpendingLimits, sessionKeysExpirationHeights, txOptions) {
     const oThis = this;
 
     const txObject = oThis._createCompanyWalletRawTx(
-      proxyFactory,
       owner,
       sessionKeys,
       sessionKeysSpendingLimits,
@@ -399,15 +390,14 @@ class User {
    * Private method used for creation and configuration of token holder proxy contract for company
    * with hardware wallet as it's owner.
    *
-   * @param proxyFactory proxyFactory contract address.
    * @param owner TokenHolder proxy owner address. It could be hardware wallet address.
    * @param sessionKeys Session key addresses to authorize.
    * @param sessionKeysSpendingLimits Session key's spending limits.
    * @param sessionKeysExpirationHeights Session key's expiration heights.
    *
    * @returns Promise object.
    */
-  _createCompanyWalletRawTx(proxyFactory, owner, sessionKeys, sessionKeysSpendingLimits, sessionKeysExpirationHeights) {
+  _createCompanyWalletRawTx(owner, sessionKeys, sessionKeysSpendingLimits, sessionKeysExpirationHeights) {
     const oThis = this;
 
     const thSetupExecutableData = oThis.getTokenHolderSetupExecutableData(
@@ -419,7 +409,7 @@ class User {
 
     const jsonInterface = oThis.abiBinProvider.getABI(ProxyFactoryContractName);
 
-    const contract = new oThis.auxiliaryWeb3.eth.Contract(jsonInterface, proxyFactory);
+    const contract = new oThis.auxiliaryWeb3.eth.Contract(jsonInterface, oThis.proxyFactory);
 
     return contract.methods.createProxy(oThis.tokenHolderMasterCopy, thSetupExecutableData);
   }

diff --git a/test/integration/DirectTransfer.js b/test/integration/DirectTransfer.js
@@ -309,7 +309,7 @@ describe('Direct transfers between TH contracts', async function() {
       mockToken,
       tokenRulesAddress,
       userWalletFactoryAddress,
-      null, // proxy factory address
+      proxyFactoryAddress, // proxy factory address
       auxiliaryWeb3
     );
 
@@ -319,7 +319,6 @@ describe('Direct transfers between TH contracts', async function() {
     const sessionKeys = [sessionKey];
 
     const response = await userInstance.createCompanyWallet(
-      proxyFactoryAddress,
       thMasterCopyAddress,
       sessionKeys,
       [config.sessionKeySpendingLimit],