Skip to content

commits from bitcoin/master#298

Merged
FeatherCoin merged 17 commits into
FeatherCoin:masterfrom
Bushstar:master
Apr 17, 2018
Merged

commits from bitcoin/master#298
FeatherCoin merged 17 commits into
FeatherCoin:masterfrom
Bushstar:master

Conversation

@Bushstar

Copy link
Copy Markdown
Collaborator

tests: Remove compatibility code not needed now when we're on Python 3
bitcoin/bitcoin#12993

tests/tools: Enable additional Python flake8 rules for automatic linting via Travis
bitcoin/bitcoin#12987

tests: Remove redundant bytes(…) calls
bitcoin/bitcoin#12996

Network specific conf sections
bitcoin/bitcoin#11862

Add python3 script shebang lint
bitcoin/bitcoin#12972

practicalswift and others added 17 commits April 17, 2018 14:34
When a -nofoo option is seen, instead of adding it to a separate
set of negated args, set the arg as being an empty vector of strings.

This changes the behaviour in some ways:
 - -nofoo=0 still sets foo=1 but no longer treats it as a negated arg
 - -nofoo=1 -foo=2 has GetArgs() return [2] rather than [2,0]
 - "foo=2 \n -nofoo=1" in a config file no longer returns [2,0], just [0]
 - GetArgs returns an empty vector for negated args
…ult section

When specified in bitcoin.conf without using the [regtest] or [test]
section header, or a "regtest." or "test." prefix, the "addnode",
"connect", "port", "bind", "rpcport", "rpcbind", and "wallet" settings
will only be applied when running on mainnet.
When network-specific options such as -addnode, -connect, etc are
specified in the default section of the config file, but that setting is
ignored due to testnet or regtest being in use, and it is not overridden
by either a command line option or a setting in the [regtest] or [test]
section of the config file, a warning is added to the log, eg:

  Warning: Config setting for -connect only applied on regtest network when in [regtest] section.
@FeatherCoin FeatherCoin merged commit 6e21432 into FeatherCoin:master Apr 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants