Skip to content

Commit ca844e1

Browse files
committed
Cleaning code and type fixes
1 parent 32b2da4 commit ca844e1

File tree

6 files changed

+299
-351
lines changed

6 files changed

+299
-351
lines changed

packages/bitcore-wallet-service/src/lib/bchaddresstranslator.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
var Bitcore_ = {
1+
import _ from 'lodash';
2+
const Bitcore_ = {
23
btc: require('bitcore-lib'),
34
bch: require('bitcore-lib-cash')
45
};
56

6-
var _ = require('lodash');
7-
87
export class BCHAddressTranslator {
98
static getAddressCoin(address) {
109
try {
1110
new Bitcore_['btc'].Address(address);
1211
return 'legacy';
1312
} catch (e) {
1413
try {
15-
var a = new Bitcore_['bch'].Address(address);
14+
const a = new Bitcore_['bch'].Address(address);
1615
if (a.toLegacyAddress() == address) return 'copay';
1716
return 'cashaddr';
1817
} catch (e) {
@@ -23,20 +22,20 @@ export class BCHAddressTranslator {
2322

2423
// Supports 3 formats: legacy (1xxx, mxxxx); Copay: (Cxxx, Hxxx), Cashaddr(qxxx);
2524
static translate(addresses, to, from?) {
26-
var wasArray = true;
25+
let wasArray = true;
2726
if (!_.isArray(addresses)) {
2827
wasArray = false;
2928
addresses = [addresses];
3029
}
3130
from = from || BCHAddressTranslator.getAddressCoin(addresses[0]);
3231

33-
var ret;
32+
let ret;
3433
if (from == to) {
3534
ret = addresses;
3635
} else {
3736
ret = _.filter(
38-
_.map(addresses, function(x) {
39-
var bitcore = Bitcore_[from == 'legacy' ? 'btc' : 'bch'];
37+
_.map(addresses, (x) => {
38+
const bitcore = Bitcore_[from == 'legacy' ? 'btc' : 'bch'];
4039
let orig;
4140

4241
try {

packages/bitcore-wallet-service/src/lib/blockchainexplorer.ts

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
'use strict';
2-
1+
import _ from 'lodash';
32
import { V8 } from './blockchainexplorers/v8';
4-
var _ = require('lodash');
5-
var $ = require('preconditions').singleton();
6-
var log = require('npmlog');
7-
log.debug = log.verbose;
83

9-
var Common = require('./common');
10-
var Constants = Common.Constants,
11-
Defaults = Common.Defaults,
12-
Utils = Common.Utils;
4+
const $ = require('preconditions').singleton();
5+
const Common = require('./common');
6+
const Defaults = Common.Defaults;
7+
let log = require('npmlog');
8+
log.debug = log.verbose;
139

14-
var PROVIDERS = {
10+
const PROVIDERS = {
1511
v8: {
1612
btc: {
1713
livenet: 'https://api.bitpay.com',
@@ -27,9 +23,9 @@ var PROVIDERS = {
2723
export function BlockChainExplorer(opts) {
2824
$.checkArgument(opts);
2925

30-
var provider = opts.provider || 'v8';
31-
var coin = opts.coin || Defaults.COIN;
32-
var network = opts.network || 'livenet';
26+
const provider = opts.provider || 'v8';
27+
const coin = opts.coin || Defaults.COIN;
28+
const network = opts.network || 'livenet';
3329

3430
$.checkState(PROVIDERS[provider], 'Provider ' + provider + ' not supported');
3531
$.checkState(
@@ -42,7 +38,7 @@ export function BlockChainExplorer(opts) {
4238
'Network ' + network + ' not supported by this provider for coin ' + coin
4339
);
4440

45-
var url = opts.url || PROVIDERS[provider][coin][network];
41+
const url = opts.url || PROVIDERS[provider][coin][network];
4642

4743
if (coin != 'bch' && opts.addressFormat)
4844
throw new Error('addressFormat only supported for bch');

0 commit comments

Comments
 (0)