Graphql Branch Refresh #3
Open
Conversation
This file contains 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
* core/blockchain: better printout of receipts in bad block reports * fix splleing
core: better side-chain importing
…8162) * params: Add Constantinople block to AllCliqueProtocolChanges * params: Add Constantinople block to AllEthashProtocolChanges
trie/database: fix overflow in parent tracking
- Have `${DataDir}/bzzd.ipc` as IPC path default.
- Respect the `--datadir` flag.
- Keep only the global `--ipcpath` flag and drop the local `--ipcpath` flag
as flags might overwrite each other. (Note: before global `--ipcpath`
was ignored even if it was set)
fixes ethersphere#795
* core: return error if repair block failed * make error a bit shorter
config: add constantinople block to testchainconfig
TryUpdate does not call t.trie.TryUpdate(key, value) and calls t.trie.TryDelete instead. The update operation simply deletes the corresponding entry, though it could retrieve later by odr. However, it adds further network overhead.
* cmd/swarm: fix ethersphere/swarm#979: update should error on manifest mistmatch * cmd/swarm: fixed comments and remove sprintf from log.Info * cmd/swarm: remove unnecessary comment
* swarm/network/stream/: added stream protocol version match tests * Increase BZZ version due to streamer version change; version tests * swarm/network: increased hive and test protocol version
* Update net.go more simple * Update net.go
* fix slice unpack bug in accounts/abi
* swarm/network/stream: fix visualized_snapshot_sync_sim_test * swarm/network/stream: updated visualized snapshot-test;data in p2p event * swarm/network/stream: cleanup visualized snapshot sync test * swarm/network/stream: re-enable t.Skip for visualized test * swarm/network/stream: addressed PR comments
…thereum#18335) * downloader: fix edgecase where returned index is OOB for downloader * downloader: documentation Co-Authored-By: holiman <martin@swende.se>
* core: sanitize more TxPoolConfig fields * core: fix TestTransactionPendingMinimumAllowance
…reum#18287) * p2p/simulation: WIP minimal snapshot test * p2p/simulation: Add snapshot create, load and verify to snapshot test * build: add test tag for tests * p2p/simulations, build: Revert travis change, build test sym always * p2p/simulations: Add comments, timeout check on additional events * p2p/simulation: Add benchmark template for minimal peer protocol init * p2p/simulations: Remove unused code * p2p/simulation: Correct timer reset * p2p/simulations: Put snapshot check events in buffer and call blocking * p2p/simulations: TestSnapshot fail if Load function returns early * p2p/simulations: TestSnapshot wait for all connections before returning * p2p/simulation: Revert to before wait for snap load (5e75594) * p2p/simulations: add "conns after load" subtest to TestSnapshot and nudge
* p2p/protocols: accounting metrics rpc added (ethereum#847) * p2p/protocols: accounting api documentation added (ethereum#847) * p2p/protocols: accounting api doc updated (ethereum#847) * p2p/protocols: accounting api doc update (ethereum#847) * p2p/protocols: accounting api doc update (ethereum#847) * p2p/protocols: fix file is not gofmted * fix lint error * updated comments after review * add account balance to rpc * naming changed after review
* swarm/network: Revised depth calculation with tests * swarm/network: WIP remove redundant "full" function * swarm/network: WIP peerpot refactor * swarm/network: Make test methods submethod of peerpot and embed kad * swarm/network: Remove commented out code * swarm/network: Rename health test functions * swarm/network: Too many n's * swarm/network: Change hive Healthy func to accept addresses * swarm/network: Add Healthy proxy method for api in hive * swarm/network: Skip failing test out of scope for PR * swarm/network: Skip all tests dependent on SuggestPeers * swarm/network: Remove commented code and useless kad Pof member * swarm/network: Remove more unused code, add counter on depth test errors * swarm/network: WIP Create Healthy assertion tests * swarm/network: Roll back health related methods receiver change * swarm/network: Hardwire network minproxbinsize in swarm sim * swarm/network: Rework Health test to strict Pending add test for saturation And add test for as many as possible up to saturation * swarm/network: Skip discovery tests (dependent on SuggestPeer) * swarm/network: Remove useless minProxBinSize in stream * swarm/network: Remove unnecessary testing.T param to assert health * swarm/network: Implement t.Helper() in checkHealth * swarm/network: Rename check back to assert now that we have helper magic * swarm/network: Revert WaitTillHealthy change (deferred to nxt PR) * swarm/network: Kademlia tests GotNN => ConnectNN * swarm/network: Renames and comments * swarm/network: Add comments
|
Thanks for this! However, I don't see any way to effectively review this, since it's showing me the difference between my current branch and the one with the merges applied. I may just have to apply the diff myself. |
|
Yes, there are a lot of changes because of the master update merge. Are your concerns with the changes that I made specifically or the affect on all of the combined changes. The file api.go was the only file that had conflicts. The merge commit attempted to resolve them and subsequent commit tries to make the design of the code more consistent. Let me know if there is anything I can do to help out. Would it be helpful if I annotated my changes in the PR? |
|
The concern is purely that the diff doesn't let me see what's actually
changed in the PR without applying it from scratch. It's probably more
efficient for me to do the rebase myself and post it - but thank you for
the poke!
…On Mon, Dec 31, 2018 at 4:09 PM Kris Shinn ***@***.***> wrote:
Yes, there are a lot of changes because of the master update merge. Are
your concerns with the changes that I made specifically or the affect on
all of the combined changes. The file api.go
<https://github.com/Arachnid/go-ethereum/blob/81efd4b8814f9559753bc7e6f086acab5823df91/internal/ethapi/api.go>
was the only file that had conflicts. The merge commit attempted to resolve
them and subsequent commit tries to make the design of the code more
consistent.
Let me know if there is anything I can do to help out. Would it be helpful
if I annotated my changes in the PR?
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#3 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AABFyR9ArAl3EL7E1XfSifVvLOwrYmN_ks5u-X_xgaJpZM4Zk0zk>
.
|
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.
I'm trying to see if we can get this initiative picked back up. I've rebased current master against your graphql branch. There was also some conflicts in the api.go file that I tried to resolve. There seemed to be a difference on the public / private
XyzandDoXyzcalls. A couple of the calls were also detached from thePublicBlockChainApistruct that I'm not sure were on purpose or not. I've "fixed" them as to what I think they should be, but I don't know what the original intention was so it may not be correct. Commit 81efd4b is where that last bit was done.