From a80de5658a26322cc1a8468c31a3e803fd37c0c9 Mon Sep 17 00:00:00 2001
From: Mo Morsi <mo@morsi.org>
Date: Sat, 8 Sep 2018 17:24:21 -0400
Subject: [PATCH] Move deriveKeypair and deriveAddress to offline module

---
 src/api.ts            | 8 +++-----
 src/common/utils.ts   | 6 ++----
 src/offline/derive.ts | 7 +++++++
 3 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 src/offline/derive.ts

diff --git a/src/api.ts b/src/api.ts
index 45e3a100..ea5dc101 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -45,6 +45,7 @@ import sign from './transaction/sign'
 import combine from './transaction/combine'
 import submit from './transaction/submit'
 import {generateAddressAPI} from './offline/generate-address'
+import {deriveKeypair, deriveAddress} from './offline/derive'
 import computeLedgerHash from './offline/ledgerhash'
 import signPaymentChannelClaim from './offline/sign-payment-channel-claim'
 import verifyPaymentChannelClaim from './offline/verify-payment-channel-claim'
@@ -66,7 +67,6 @@ import {
 import RangeSet from './common/rangeset'
 import * as ledgerUtils from './ledger/utils'
 import * as transactionUtils from './transaction/utils'
-import * as commonUtils from './common/utils'
 import * as schemaValidator from './common/schema-validator'
 import {getServerInfo, getFee} from './common/serverinfo'
 import {clamp} from './ledger/utils'
@@ -111,7 +111,6 @@ class RippleAPI extends EventEmitter {
     validate,
     RangeSet,
     ledgerUtils,
-    commonUtils,
     schemaValidator
   }
 
@@ -323,6 +322,8 @@ class RippleAPI extends EventEmitter {
   submit = submit
 
   generateAddress = generateAddressAPI
+  deriveKeypair = deriveKeypair
+  deriveAddress = deriveAddress
   computeLedgerHash = computeLedgerHash
   signPaymentChannelClaim = signPaymentChannelClaim
   verifyPaymentChannelClaim = verifyPaymentChannelClaim
@@ -335,9 +336,6 @@ class RippleAPI extends EventEmitter {
 
   isValidAddress = schemaValidator.isValidAddress
   isValidSecret = schemaValidator.isValidSecret
-
-  deriveKeypair = commonUtils.deriveKeypair
-  deriveAddress = commonUtils.deriveAddress
 }
 
 export {
diff --git a/src/common/utils.ts b/src/common/utils.ts
index 6c3430c6..3781ec86 100644
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@@ -1,6 +1,6 @@
 import * as _ from 'lodash'
 import BigNumber from 'bignumber.js'
-import {deriveKeypair, deriveAddress} from 'ripple-keypairs'
+import {deriveKeypair} from 'ripple-keypairs'
 import {Amount, RippledAmount} from './types/objects'
 import {ValidationError} from './errors'
 
@@ -155,8 +155,6 @@ export {
   removeUndefined,
   rippleTimeToISO8601,
   iso8601ToRippleTime,
-  isValidSecret,
-  deriveKeypair,
-  deriveAddress
+  isValidSecret
 }
 
diff --git a/src/offline/derive.ts b/src/offline/derive.ts
new file mode 100644
index 00000000..bbf029b0
--- /dev/null
+++ b/src/offline/derive.ts
@@ -0,0 +1,7 @@
+import {deriveKeypair, deriveAddress} from 'ripple-keypairs'
+
+export {
+  deriveKeypair,
+  deriveAddress
+}
+