#43 Move approve command under token commands

eidoo · Feb 28, 2019 · 62d120a · 62d120a
1 parent b35b0cd
commit 62d120a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,11 +20,14 @@ Release date: 2019-02-REPLEACE_ME.
 - [CLI approve command](https://github.com/eidoo/hybrid-exchange-sdk/issues/18)
 - [CLI withdraw command](https://github.com/eidoo/hybrid-exchange-sdk/issues/13)
 - [Deposit Token with approve](https://github.com/eidoo/hybrid-exchange-sdk/issues/11)
-- [Allowance](https://github.com/eidoo/hybrid-exchange-sdk/issues/7).
-- [Private key from mnemonic](https://github.com/eidoo/hybrid-exchange-sdk/issues/5).
-- [Pair fee](https://github.com/eidoo/hybrid-exchange-sdk/issues/1).
-- [Pair last price](https://github.com/eidoo/hybrid-exchange-sdk/issues/3).
+- [Allowance](https://github.com/eidoo/hybrid-exchange-sdk/issues/7)
+- [Private key from mnemonic](https://github.com/eidoo/hybrid-exchange-sdk/issues/5)
+- [Pair fee](https://github.com/eidoo/hybrid-exchange-sdk/issues/1)
+- [Pair last price](https://github.com/eidoo/hybrid-exchange-sdk/issues/3)
 
+### Changed
+
+- [Approve command](https://github.com/eidoo/hybrid-exchange-sdk/issues/43)
 
 ## [v1.1.0](https://gitlab.com/eidoo_io/hybrid-exchange-sdk/compare/fa85a7...v1.1.0)
 

diff --git a/src/cli/trading-wallet/approve.js → src/cli/token/approve.js b/src/cli/trading-wallet/approve.js → src/cli/token/approve.js
diff --git a/src/commands/commandList.js b/src/commands/commandList.js
@@ -1,4 +1,4 @@
-const ApproveCommandBuilder = require('../factories/commands/trading-wallet/ApproveCommandBuilder')
+const ApproveCommandBuilder = require('../factories/commands/token/ApproveCommandBuilder')
 const CreateWalletCommandBuilder = require('../factories/commands/trading-wallet/CreateWalletCommandBuilder')
 const DepositEthCommandBuilder = require('../factories/commands/trading-wallet/DepositEthCommandBuilder')
 const DepositTokenCommandBuilder = require('../factories/commands/trading-wallet/DepositTokenCommandBuilder')

diff --git a/...commands/trading-wallet/ApproveCommand.js → src/commands/token/ApproveCommand.js b/...commands/trading-wallet/ApproveCommand.js → src/commands/token/ApproveCommand.js
diff --git a/src/commands/token/GetAllowanceCommand.js b/src/commands/token/GetAllowanceCommand.js
@@ -102,7 +102,7 @@ class GetAllowanceCommand extends ABaseCommand {
 
     if (privateKeyFilePath) {
       const privateKey = await this.extractPrivateKey(privateKeyFilePath)
-      ownerAddressRetrived = this.getAddressOromPrivateKey(owner, privateKey)
+      ownerAddressRetrived = this.getAddressFromPrivateKey(owner, privateKey)
     }
 
     if (draft) {

diff --git a/...s/trading-wallet/ApproveCommandBuilder.js → ...s/commands/token/ApproveCommandBuilder.js b/...s/trading-wallet/ApproveCommandBuilder.js → ...s/commands/token/ApproveCommandBuilder.js
@@ -1,5 +1,5 @@
-const ApproveCommand = require('../../../commands/trading-wallet/ApproveCommand')
-const ApproveCommandValidator = require('../../../validators/commands/trading-wallet/ApproveCommandValidator')
+const ApproveCommand = require('../../../commands/token/ApproveCommand')
+const ApproveCommandValidator = require('../../../validators/commands/token/ApproveCommandValidator')
 const { PrivateKeyService } = require('../../../services/PrivateKeyService')
 const PrivateKeyValidator = require('../../../validators/PrivateKeyValidator')
 

diff --git a/...trading-wallet/ApproveCommandValidator.js → ...commands/token/ApproveCommandValidator.js b/...trading-wallet/ApproveCommandValidator.js → ...commands/token/ApproveCommandValidator.js