Skip to content
This repository was archived by the owner on Dec 10, 2020. It is now read-only.

Commit ffb24fe

Browse files
committed
Initial lint:fix
1 parent 002e886 commit ffb24fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1211
-1108
lines changed

bin/cli.ts

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,74 +16,73 @@ const fs = require('fs-extra')
1616
const networks = Object.entries(chains.names)
1717
const args = require('yargs')
1818
.options({
19-
'network': {
19+
network: {
2020
describe: `Network`,
21-
choices: networks.map(n => n[1]),
22-
default: networks[0][1]
21+
choices: networks.map((n) => n[1]),
22+
default: networks[0][1],
2323
},
2424
'network-id': {
2525
describe: `Network ID`,
26-
choices: networks.map(n => parseInt(n[0])),
27-
default: undefined
26+
choices: networks.map((n) => parseInt(n[0])),
27+
default: undefined,
2828
},
29-
'syncmode': {
29+
syncmode: {
3030
describe: 'Blockchain sync mode',
31-
choices: [ 'light', 'fast' ],
32-
default: 'fast'
31+
choices: ['light', 'fast'],
32+
default: 'fast',
3333
},
34-
'lightserv': {
34+
lightserv: {
3535
describe: 'Serve light peer requests',
3636
boolean: true,
37-
default: false
37+
default: false,
3838
},
39-
'datadir': {
39+
datadir: {
4040
describe: 'Data directory for the blockchain',
41-
default: `${os.homedir()}/Library/Ethereum`
41+
default: `${os.homedir()}/Library/Ethereum`,
4242
},
43-
'transports': {
43+
transports: {
4444
describe: 'Network transports',
4545
default: ['rlpx:port=30303', 'libp2p'],
46-
array: true
46+
array: true,
4747
},
48-
'rpc': {
48+
rpc: {
4949
describe: 'Enable the JSON-RPC server',
5050
boolean: true,
51-
default: false
51+
default: false,
5252
},
53-
'rpcport': {
53+
rpcport: {
5454
describe: 'HTTP-RPC server listening port',
5555
number: true,
56-
default: 8545
56+
default: 8545,
5757
},
58-
'rpcaddr': {
58+
rpcaddr: {
5959
describe: 'HTTP-RPC server listening interface',
60-
default: 'localhost'
60+
default: 'localhost',
6161
},
62-
'loglevel': {
62+
loglevel: {
6363
describe: 'Logging verbosity',
64-
choices: [ 'error', 'warn', 'info', 'debug' ],
65-
default: 'info'
64+
choices: ['error', 'warn', 'info', 'debug'],
65+
default: 'info',
6666
},
67-
'minPeers': {
67+
minPeers: {
6868
describe: 'Peers needed before syncing',
6969
number: true,
70-
default: 2
70+
default: 2,
7171
},
72-
'maxPeers': {
72+
maxPeers: {
7373
describe: 'Maximum peers to sync with',
7474
number: true,
75-
default: 25
75+
default: 25,
7676
},
77-
'params': {
77+
params: {
7878
describe: 'Path to chain parameters json file',
79-
coerce: path.resolve
80-
}
79+
coerce: path.resolve,
80+
},
8181
})
82-
.locale('en_EN')
83-
.argv
82+
.locale('en_EN').argv
8483
const logger = getLogger({ loglevel: args.loglevel })
8584

86-
async function runNode (options: any) {
85+
async function runNode(options: any) {
8786
logger.info('Initializing Ethereumjs client...')
8887
if (options.lightserv) {
8988
logger.info(`Serving light peer requests`)
@@ -104,7 +103,7 @@ async function runNode (options: any) {
104103
return node
105104
}
106105

107-
function runRpcServer (node: any, options: any) {
106+
function runRpcServer(node: any, options: any) {
108107
const { rpcport, rpcaddr } = options
109108
const manager = new RPCManager(node, options)
110109
const server = new RPCServer(manager.getMethods())
@@ -114,11 +113,11 @@ function runRpcServer (node: any, options: any) {
114113
return server
115114
}
116115

117-
async function run () {
116+
async function run() {
118117
const syncDirName = args.syncmode === 'light' ? 'lightchaindata' : 'chaindata'
119118
// give network id precedence over network name
120119
if (args.networkId) {
121-
const network = networks.find(n => n[0] === `${args.networkId}`)
120+
const network = networks.find((n) => n[0] === `${args.networkId}`)
122121
if (network) {
123122
args.network = network[1]
124123
}
@@ -151,7 +150,7 @@ async function run () {
151150
rpcport: args.rpcport,
152151
rpcaddr: args.rpcaddr,
153152
minPeers: args.minPeers,
154-
maxPeers: args.maxPeers
153+
maxPeers: args.maxPeers,
155154
}
156155
const node = await runNode(options)
157156
const server = args.rpc ? runRpcServer(node, options) : null
@@ -165,4 +164,4 @@ async function run () {
165164
})
166165
}
167166

168-
run().catch(err => logger.error(err))
167+
run().catch((err) => logger.error(err))

lib/blockchain/chain.ts

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ const promisify = require('util-promisify')
88

99
const defaultOptions = {
1010
logger: defaultLogger,
11-
common: new Common('mainnet', 'chainstart')
11+
common: new Common('mainnet', 'chainstart'),
1212
}
1313

1414
/**
1515
* Blockchain
1616
* @memberof module:blockchain
1717
*/
1818
export class Chain extends events.EventEmitter {
19-
2019
public logger: any
2120
public common: Common
2221
public db: any
@@ -27,13 +26,13 @@ export class Chain extends events.EventEmitter {
2726
private _headers = {}
2827
private _blocks = {}
2928

30-
private _getBlocks: Function | undefined
31-
private _getBlock: Function | undefined
32-
private _putBlocks: Function | undefined
33-
private _putHeaders: Function | undefined
34-
private _getLatestHeader: Function | undefined
35-
private _getLatestBlock: Function | undefined
36-
private _getTd: Function | undefined
29+
private _getBlocks: Function | undefined
30+
private _getBlock: Function | undefined
31+
private _putBlocks: Function | undefined
32+
private _putHeaders: Function | undefined
33+
private _getLatestHeader: Function | undefined
34+
private _getLatestBlock: Function | undefined
35+
private _getTd: Function | undefined
3736

3837
/**
3938
* Create new chain
@@ -42,7 +41,7 @@ export class Chain extends events.EventEmitter {
4241
* @param {Common} [options.common] common parameters
4342
* @param {Logger} [options.logger] Logger instance
4443
*/
45-
constructor (options?: any) {
44+
constructor(options?: any) {
4645
super()
4746
options = { ...defaultOptions, ...options }
4847

@@ -53,12 +52,12 @@ export class Chain extends events.EventEmitter {
5352
this.init()
5453
}
5554

56-
init () {
55+
init() {
5756
if (!this.blockchain) {
5857
this.blockchain = new Blockchain({
5958
db: this.db,
6059
validate: false,
61-
common: this.common
60+
common: this.common,
6261
})
6362
if (!this.db) {
6463
this.db = this.blockchain.db
@@ -69,32 +68,34 @@ export class Chain extends events.EventEmitter {
6968
this.opened = false
7069
}
7170

72-
reset () {
71+
reset() {
7372
this._headers = {
7473
latest: null,
7574
td: new BN(0),
76-
height: new BN(0)
75+
height: new BN(0),
7776
}
7877
this._blocks = {
7978
latest: null,
8079
td: new BN(0),
81-
height: new BN(0)
80+
height: new BN(0),
8281
}
8382
}
8483

8584
/**
8685
* Network ID
8786
*/
88-
get networkId (): number {
87+
get networkId(): number {
8988
return this.common.networkId()
9089
}
9190

9291
/**
9392
* Genesis block parameters
9493
*/
95-
get genesis (): object {
94+
get genesis(): object {
9695
const genesis = this.common.genesis()
97-
Object.entries(genesis).forEach(([k, v]) => { genesis[k] = hexToBuffer(v as string) })
96+
Object.entries(genesis).forEach(([k, v]) => {
97+
genesis[k] = hexToBuffer(v as string)
98+
})
9899
return genesis
99100
}
100101

@@ -103,7 +104,7 @@ export class Chain extends events.EventEmitter {
103104
* the latest header in the chain, the ``td`` property is the total difficulty of
104105
* headerchain, and the ``height`` is the height of the headerchain.
105106
*/
106-
get headers (): object {
107+
get headers(): object {
107108
return { ...this._headers }
108109
}
109110

@@ -112,14 +113,14 @@ export class Chain extends events.EventEmitter {
112113
* the latest block in the chain, the ``td`` property is the total difficulty of
113114
* blockchain, and the ``height`` is the height of the blockchain.
114115
*/
115-
get blocks (): object {
116+
get blocks(): object {
116117
return { ...this._blocks }
117118
}
118119

119120
/**
120121
* Open blockchain and wait for database to load
121122
*/
122-
async open (): Promise<boolean | void> {
123+
async open(): Promise<boolean | void> {
123124
if (this.opened) {
124125
return false
125126
}
@@ -132,7 +133,7 @@ export class Chain extends events.EventEmitter {
132133
/**
133134
* Close blockchain and database
134135
*/
135-
async close (): Promise<boolean | void> {
136+
async close(): Promise<boolean | void> {
136137
if (!this.opened) {
137138
return false
138139
}
@@ -145,7 +146,7 @@ export class Chain extends events.EventEmitter {
145146
* Update blockchain properties (latest block, td, height, etc...)
146147
* @return {Promise}
147148
*/
148-
async update (): Promise<boolean | void> {
149+
async update(): Promise<boolean | void> {
149150
if (!this.opened) {
150151
return false
151152
}
@@ -171,7 +172,7 @@ export class Chain extends events.EventEmitter {
171172
* @param skip number of blocks to skip
172173
* @param reverse get blocks in reverse
173174
*/
174-
async getBlocks (block: Buffer | BN, max: number, skip: number, reverse: boolean): Promise<any[]> {
175+
async getBlocks(block: Buffer | BN, max: number, skip: number, reverse: boolean): Promise<any[]> {
175176
if (!this.opened) {
176177
await this.open()
177178
}
@@ -185,7 +186,7 @@ export class Chain extends events.EventEmitter {
185186
* Gets a block by its hash or number
186187
* @param blocks block hash or number
187188
*/
188-
async getBlock (block: Buffer | BN): Promise<any> {
189+
async getBlock(block: Buffer | BN): Promise<any> {
189190
if (!this.opened) {
190191
await this.open()
191192
}
@@ -201,7 +202,7 @@ export class Chain extends events.EventEmitter {
201202
* @method putBlocks
202203
* @param {Block[]} blocks list of blocks to add
203204
*/
204-
async putBlocks (blocks: object[]): Promise<void> {
205+
async putBlocks(blocks: object[]): Promise<void> {
205206
if (!this.opened) {
206207
await this.open()
207208
}
@@ -223,7 +224,12 @@ export class Chain extends events.EventEmitter {
223224
* @param skip number of headers to skip
224225
* @param reverse get headers in reverse
225226
*/
226-
async getHeaders (block: Buffer | BN, max: number, skip: number, reverse: boolean): Promise<any[]> {
227+
async getHeaders(
228+
block: Buffer | BN,
229+
max: number,
230+
skip: number,
231+
reverse: boolean
232+
): Promise<any[]> {
227233
const blocks = await this.getBlocks(block, max, skip, reverse)
228234
return blocks.map((b: any) => b.header)
229235
}
@@ -233,7 +239,7 @@ export class Chain extends events.EventEmitter {
233239
* @method putHeaders
234240
* @param headers list of headers to add
235241
*/
236-
async putHeaders (headers: object[]): Promise<void> {
242+
async putHeaders(headers: object[]): Promise<void> {
237243
if (!this.opened) {
238244
await this.open()
239245
}
@@ -251,7 +257,7 @@ export class Chain extends events.EventEmitter {
251257
/**
252258
* Gets the latest header in the canonical chain
253259
*/
254-
async getLatestHeader (): Promise<any> {
260+
async getLatestHeader(): Promise<any> {
255261
if (!this.opened) {
256262
await this.open()
257263
}
@@ -265,7 +271,7 @@ export class Chain extends events.EventEmitter {
265271
/**
266272
* Gets the latest block in the canonical chain
267273
*/
268-
async getLatestBlock (): Promise<any> {
274+
async getLatestBlock(): Promise<any> {
269275
if (!this.opened) {
270276
await this.open()
271277
}
@@ -280,7 +286,7 @@ export class Chain extends events.EventEmitter {
280286
* Gets total difficulty for a block
281287
* @param hash block hash
282288
*/
283-
async getTd (hash: Buffer): Promise<any> {
289+
async getTd(hash: Buffer): Promise<any> {
284290
if (!this.opened) {
285291
await this.open()
286292
}
@@ -291,10 +297,9 @@ export class Chain extends events.EventEmitter {
291297
}
292298
}
293299

294-
function hexToBuffer (hexString: string): Buffer | string {
295-
if (typeof (hexString) === 'string' && hexString.startsWith('0x')) {
300+
function hexToBuffer(hexString: string): Buffer | string {
301+
if (typeof hexString === 'string' && hexString.startsWith('0x')) {
296302
return Buffer.from(hexString.slice(2), 'hex')
297303
}
298304
return hexString
299305
}
300-

0 commit comments

Comments
 (0)