Use "core" instead of "utils.core"

src/api/common/schema-validator.js

@@ -3,17 +3,17 @@ const _ = require('lodash');
 const fs = require('fs');
 const path = require('path');
 const validator = require('is-my-json-valid');
-const utils = require('./utils');
+const core = require('./utils').core;
 const ValidationError = require('./errors').ValidationError;
 
 let SCHEMAS = {};
 
 function isValidAddress(address) {
-  return utils.core.UInt160.is_valid(address);
+  return core.UInt160.is_valid(address);
 }
 
 function isValidLedgerHash(ledgerHash) {
-  return utils.core.UInt256.is_valid(ledgerHash);
+  return core.UInt256.is_valid(ledgerHash);
 }
 
 function loadSchema(filepath) {

src/api/common/validate.js

@@ -1,6 +1,6 @@
 'use strict';
 const _ = require('lodash');
-const utils = require('./utils');
+const core = require('./utils').core;
 const ValidationError = require('./errors').ValidationError;
 const schemaValidate = require('./schema-validator');
 
@@ -16,7 +16,7 @@ function validateAddressAndSecret(obj) {
     throw error('Parameter missing: secret');
   }
   try {
-    if (!utils.core.Seed.from_json(secret).get_key(address)) {
+    if (!core.Seed.from_json(secret).get_key(address)) {
       throw error('secret does not match address');
     }
   } catch (exception) {

src/api/transaction/order.js

@@ -2,6 +2,7 @@
 'use strict';
 const utils = require('./utils');
 const validate = utils.common.validate;
+const Transaction = utils.common.core.Transaction;
 
 const OfferCreateFlags = {
   passive: {set: 'Passive'},
@@ -13,7 +14,7 @@ function createOrderTransaction(account, order) {
   validate.address(account);
   validate.order(order);
 
-  const transaction = new utils.common.core.Transaction();
+  const transaction = new Transaction();
   const takerPays = utils.common.toRippledAmount(order.direction === 'buy' ?
     order.quantity : order.totalPrice);
   const takerGets = utils.common.toRippledAmount(order.direction === 'buy' ?

src/api/transaction/ordercancellation.js

@@ -2,12 +2,13 @@
 'use strict';
 const utils = require('./utils');
 const validate = utils.common.validate;
+const Transaction = utils.common.core.Transaction;
 
 function createOrderCancellationTransaction(account, sequence) {
   validate.address(account);
   validate.sequence(sequence);
 
-  const transaction = new utils.common.core.Transaction();
+  const transaction = new Transaction();
   transaction.offerCancel(account, sequence);
   return transaction;
 }

src/api/transaction/payment.js

@@ -5,6 +5,7 @@ const BigNumber = require('bignumber.js');
 const utils = require('./utils');
 const validate = utils.common.validate;
 const toRippledAmount = utils.common.toRippledAmount;
+const Transaction = utils.common.core.Transaction;
 
 function isSendMaxAllowed(payment) {
   const srcAmt = payment.source.amount;
@@ -41,7 +42,7 @@ function createPaymentTransaction(account, payment) {
   validate.address(account);
   validate.payment(payment);
 
-  const transaction = new utils.common.core.Transaction();
+  const transaction = new Transaction();
   transaction.payment({
     from: payment.source.address,
     to: payment.destination.address,

src/api/transaction/settings.js

@@ -6,6 +6,7 @@ const utils = require('./utils');
 const validate = utils.common.validate;
 const AccountFlagIndices = utils.common.constants.AccountFlagIndices;
 const AccountFields = utils.common.constants.AccountFields;
+const Transaction = utils.common.core.Transaction;
 
 // Emptry string passed to setting will clear it
 const CLEAR_SETTING = '';
@@ -70,7 +71,7 @@ function createSettingsTransaction(account, settings) {
   validate.address(account);
   validate.settings(settings);
 
-  const transaction = new utils.common.core.Transaction();
+  const transaction = new Transaction();
   if (settings.regularKey) {
     return transaction.setRegularKey({
       account: account,

src/api/transaction/submit.js

@@ -2,11 +2,12 @@
 'use strict';
 const utils = require('./utils');
 const validate = utils.common.validate;
+const Request = utils.common.core.Request;
 
 function submit(tx_blob: string,
     callback: (err: any, data: any) => void): void {
   validate.blob(tx_blob);
-  const request = new utils.common.core.Request(this.remote, 'submit');
+  const request = new Request(this.remote, 'submit');
   request.message.tx_blob = tx_blob;
   request.request(null, callback);
 }

src/api/transaction/trustline.js

@@ -2,6 +2,7 @@
 'use strict';
 const utils = require('./utils');
 const validate = utils.common.validate;
+const Transaction = utils.common.core.Transaction;
 
 const TrustSetFlags = {
   authorized: {set: 'SetAuth'},
@@ -19,7 +20,7 @@ function createTrustlineTransaction(account, trustline) {
     value: trustline.limit
   };
 
-  const transaction = new utils.common.core.Transaction();
+  const transaction = new Transaction();
   transaction.trustSet(account, limit,
     trustline.qualityIn, trustline.qualityOut);
   utils.setTransactionBitFlags(transaction, trustline, TrustSetFlags);