Merge pull request #42 from Loopring/arrow-function

use arrow functions and use ecma6

Author: lyddream

README.md

@@ -38,7 +38,7 @@ Include the following script tags in your HTML:
 <script src="../bower_components/async/dist/async.js"></script>
 <script src="../bower_components/axios/dist/axios.min.js"></script>
 <script src="../bower_components/bignumber.js/bignumber.min.js"></script>
-<script src="../bower_components/axios/lib/bn.js"></script>
+<script src="../node_modules/bn.js/lib/bn.js"></script>
 <script src="../bower_components/lodash/dist/lodash.min.js"></script>
 <script src="../bower_components/loopring.js/dist/loopring.min.js"></script>
 ```

dist/loopring.min.js

@@ -50,7 +50,7 @@ exports.decryptKeystoreToPkey = (keystore, password) =>
     return wallet;
 };
 
-exports.pkeyToKeystore = function (privateKey, password)
+exports.pkeyToKeystore = (privateKey, password) =>
 {
     const salt = crypto.randomBytes(32);
     const iv = crypto.randomBytes(16);

src/keystore.js

@@ -109,7 +109,7 @@ function Order (data)
         'uint8'
     ];
 
-    this.sign = function (privateKey)
+    this.sign = (privateKey) =>
     {
         const validation = ajv.validate(orderSchema, data);
 
@@ -161,7 +161,7 @@ function Order (data)
         };
     };
 
-    this.cancel = function (amount, privateKey)
+    this.cancel = (amount, privateKey) =>
     {
         if (!r || !v || !s)
         {

src/order.js

@@ -337,7 +337,7 @@ function relay (host)
         return new BigNumber(Number(await this.call(params, tag)));
     };
 
-    this.submitLoopringOrder = async function (order)
+    this.submitLoopringOrder = async (order) =>
     {
         request.method = 'loopring_submitOrder';
         request.params = [order];
@@ -362,7 +362,7 @@ function relay (host)
         return this.sendSignedTx(tx.signedTx);
     };
 
-    this.getOrders = async function (filter)
+    this.getOrders = async (filter) =>
     {
         request.method = 'loopring_getOrders';
         request.params = [filter];
@@ -381,7 +381,7 @@ function relay (host)
         });
     };
 
-    this.getDepth = async function (filter)
+    this.getDepth = async (filter) =>
     {
         request.method = 'loopring_getDepth';
         request.params = [ filter ];
@@ -400,7 +400,7 @@ function relay (host)
         });
     };
 
-    this.getTicker = async function (market)
+    this.getTicker = async (market) =>
     {
         request.method = 'loopring_getTicker';
         request.params = [market];
@@ -419,7 +419,7 @@ function relay (host)
         });
     };
 
-    this.getFills = async function (filter)
+    this.getFills = async (filter) =>
     {
         // filter:market, address, pageIndex, pageSize,contractVersion
         request.method = 'loopring_getFills';
@@ -439,7 +439,7 @@ function relay (host)
         });
     };
 
-    this.getTrend = async function (market)
+    this.getTrend = async (market) =>
     {
         // filter:market
         request.method = 'loopring_getTrend';
@@ -459,7 +459,7 @@ function relay (host)
         });
     };
 
-    this.getRingMined = async function (filter)
+    this.getRingMined = async (filter) =>
     {
         // filter:ringHash, orderHash, miner, pageIndex, pageSize,contractVersion
         request.method = 'loopring_getRingMined';
@@ -479,7 +479,7 @@ function relay (host)
         });
     };
 
-    this.getBalances = async function (address)
+    this.getBalances = async (address) =>
     {
         request.method = 'loopring_getBalance';
         request.params = [{ address }];

src/relay.js

@@ -59,7 +59,7 @@ const transactionSchema = {
 };
 
 const ajv = new Ajv();
-exports.solSHA3 = function (types, data)
+exports.solSHA3 = (types, data) =>
 {
     const hash = abi.soliditySHA3(types, data);
     return hash;
@@ -82,7 +82,7 @@ exports.signEthTx = (tx, privateKey) =>
     return '0x' + ethTx.serialize().toString('hex');
 };
 
-exports.generateCancelOrderData = function (order)
+exports.generateCancelOrderData = (order) =>
 {
     const data = abi.rawEncode([
         'address[3]',
@@ -114,42 +114,42 @@ exports.generateCancelOrderData = function (order)
     return '0x' + method + data;
 };
 
-exports.generateCutOffData = function (timestamp)
+exports.generateCutOffData = (timestamp) =>
 {
     const method = abi.methodID('setCutoff', ['uint']).toString('hex');
     const data = abi.rawEncode(['uint'], [timestamp]).toString('hex');
     return '0x' + method + data;
 };
 
-exports.generateApproveData = function (address, amount)
+exports.generateApproveData = (address, amount) =>
 {
     const method = abi.methodID('approve', ['address', 'uint']).toString('hex');
     const data = abi.rawEncode(['address', 'uint'], [address, amount]).toString('hex');
     return '0x' + method + data;
 };
 
-exports.generateWithdrawData = function (amount)
+exports.generateWithdrawData = (amount) =>
 {
     const method = abi.methodID('withdraw', ['uint']).toString('hex');
     const data = abi.rawEncode(['uint'], [amount]).toString('hex');
     return '0x' + method + data;
 };
 
-exports.generateTransferData = function (address, amount)
+exports.generateTransferData = (address, amount) =>
 {
     const method = abi.methodID('transfer', ['address', 'uint']).toString('hex');
     const data = abi.rawEncode(['address', 'uint'], [address, amount]).toString('hex');
     return '0x' + method + data;
 };
 
-exports.generateBalanceOfData = function (address)
+exports.generateBalanceOfData = (address) =>
 {
     const method = abi.methodID('balanceOf', ['address']).toString('hex');
     const data = abi.rawEncode(['address'], [address]).toString('hex');
     return '0x' + method + data;
 };
 
-exports.generateAllowanceData = function (owner, spender)
+exports.generateAllowanceData = (owner, spender) =>
 {
     const method = abi.methodID('allowance', ['address', 'address']).toString('hex');
     const data = abi.rawEncode(['address', 'address'], [owner, spender]).toString('hex');

src/signer.js

@@ -26,14 +26,14 @@ function Wallet ()
     let publicKey;
     let address;
 
-    this.generate = function ()
+    this.generate = () =>
     {
         privateKey = crypto.randomBytes(32);
         publicKey = ethereumUtil.privateToPublic(privateKey);
         address = ethereumUtil.publicToAddress(publicKey);
     };
 
-    this.setPrivateKey = function (key)
+    this.setPrivateKey = (key) =>
     {
         if (typeof key === 'string')
         {
@@ -44,12 +44,12 @@ function Wallet ()
         address = ethereumUtil.publicToAddress(publicKey);
     };
 
-    this.getAddress = function ()
+    this.getAddress = () =>
     {
         return ethereumUtil.toChecksumAddress('0x' + address.toString('hex'));
     };
 
-    this.toKeystore = function (password)
+    this.toKeystore = (password) =>
     {
         return keystore.pkeyToKeystore(privateKey, password);
     };

src/wallet.js

@@ -39,7 +39,7 @@ module.exports = {
             parallel: true,
             uglifyOptions: {
                 beautify: false,
-                ecma: 5,
+                ecma: 6,
                 compress: true,
                 comments: false
             }