Fixed _setDataPath when the bitcore node is using the regtest network and some bugs related with newer electron versions.#14
Open
bethnull wants to merge 2 commits intobitpay:masterfrom
Open
Conversation
Comparing this.node.network against Networks.livenet and Networks.testnet works when the bitcore node is using the livenet and testnet networks, however when using the regtest network the extra field regTestEnabled present in this.node.network makes comparing it with Networks.testnet to fail.
this.node.network:
Network {
name: 'testnet',
alias: 'regtest',
pubkeyhash: 111,
privatekey: 239,
scripthash: 196,
xpubkey: 70617039,
xprivkey: 70615956,
port: [Getter],
networkMagic: [Getter],
dnsSeeds: [Getter],
regtestEnabled: true }
Networks.testnet:
Network {
name: 'testnet',
alias: 'regtest',
pubkeyhash: 111,
privatekey: 239,
scripthash: 196,
xpubkey: 70617039,
xprivkey: 70615956,
port: [Getter],
networkMagic: [Getter],
dnsSeeds: [Getter] }
app, BrowserWindow and crash-reporter are now fetched via require('electron').app and require('electron').BrowserWindow and require('electron').crashReporter respectively.
crashReporter also needs a config object in its start method.
rdev66
approved these changes
Jul 23, 2017
rdev66
reviewed
Jul 23, 2017
rdev66
left a comment
There was a problem hiding this comment.
I did the same changes to main.js in order for the app. to run with newer versions of Electron.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Comparing this.node.network against Networks.livenet and Networks.testnet works when the bitcore node is using the livenet and testnet networks, however when using the regtest network the extra field regTestEnabled present in this.node.network makes comparing it with Networks.testnet to fail.
this.node.network:
Network {
name: 'testnet',
alias: 'regtest',
pubkeyhash: 111,
privatekey: 239,
scripthash: 196,
xpubkey: 70617039,
xprivkey: 70615956,
port: [Getter],
networkMagic: [Getter],
dnsSeeds: [Getter],
regtestEnabled: true }
Networks.testnet:
Network {
name: 'testnet',
alias: 'regtest',
pubkeyhash: 111,
privatekey: 239,
scripthash: 196,
xpubkey: 70617039,
xprivkey: 70615956,
port: [Getter],
networkMagic: [Getter],
dnsSeeds: [Getter] }