Merge from ethereum/go-ethereum#1
Merged
Merged
Conversation
cmd/rlpdump: allow hex input to have leading '0x'
* les: fix topic ID * core/bloombits: fix interface conversion
core, swarm: typo fixes
* core: allow price bump at threshold * core: test changes to allow price bump at threshold * core: reinstate tx replacement test underneath threshold * core: minor test failure message cleanups
All logs in the FilterLog return value would be the same object because the for loop captured the pointer to the iteration variable.
travis: bump Android NDK version and Android Go builder
build: enable gofmt and misspell linters
This changes behaviour: before if the owner/amount didn't match, it resulted in a successful execution without doing anything; now it results in a failed execution using the revert opcode (remainder gas is not consumed).
* build: enable unconvert linter - fixes #15453 - update code base for failing cases * cmd/puppeth: replace syscall.Stdin with os.Stdin.Fd() for unconvert linter
github.com/stretchr/testify is a useful library for doing assertion in tests. It makes assertions in test more less verbose and more comfortable to read and use.
#15458) * .dockerignore, internal/build: Read git information directly from file This commit changes the way of retrieving git commit and branch for build environment from running git command to reading git files directly. This commit also adds required git files into Docker build context. fixes: #15346 * .dockerignore: workaround for including some files in .git
les: clean up tx journal file after testing
build: fix typo in comment
cmd/puppeth: new version as presented at devcon3
* cmd: fix typo in comment * cmd/puppeth: tiny comment fixup
* console: fix typo in comment * contracts/release: fix typo in comment * core: fix typo in comment * eth: fix typo in comment * miner: fix typo in comment
internal/ethapi: avoid recreating JavaScript tracer wrappers
* cmd, consensus, eth: split ethash related config to it own * eth, consensus: minor polish * eth, consenus, console: compress pow testing config field to single one * consensus, eth: document pow mode
accounts/keystore: change modtime for test case files to be bigger than 1sec.
swarm/api: bug fix exact match for manifest
core/state: copy trie too, not just content
* Disallow --lightserv in light mode * Reformatted * cmd/utils: reduce nesting levels a bit
Signed-off-by: Maximilian Meister <mmeister@suse.de>
* trie: make fullnode children hash calculation concurrently * trie: thread out only on topmost fullnode * trie: clean up full node children hash calculation * trie: minor code fixups
cmd/utils: bootstrap nodes in config file were not respected
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
14 participants
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.
Merges from ethereum/go-ethereum into manicprogrammer/go-ethereum fork