Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Expanse compatibility #2369

Merged
merged 11 commits into from
Sep 28, 2016
Merged

Expanse compatibility #2369

merged 11 commits into from
Sep 28, 2016

Conversation

gavofyork
Copy link
Contributor

Adds a few additional bits of parameterisation.

@gavofyork gavofyork added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Sep 28, 2016
@arkpar arkpar added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Sep 28, 2016
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) to 85.162% when pulling c7e9dcb on exp-compat into fb92a98 on master.

@@ -48,6 +48,7 @@ impl Default for SyncConfig {
SyncConfig {
max_download_ahead_blocks: 20000,
network_id: U256::from(1),
subprotocol_name: *b"eth",
Copy link
Contributor

@rphmeier rphmeier Sep 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove the constant for eth? it's still used here.

@rphmeier
Copy link
Contributor

seems like it's using a magic "eth" value a lot -- it should be a constant.

@gavofyork
Copy link
Contributor Author

it's used only twice in this context, once in the network module's api.rs to implement Default in a struct, the other as a fallback mechanism in the ethcore module should the JSON not contain the key. i don't think we save much by creating a constant which must then be exported through multiple modules and used by the higher-level modules. we'd be adding ~5 lines to save a single, rather tenuous, repetition.

@gavofyork gavofyork merged commit 15a14a5 into master Sep 28, 2016
@gavofyork gavofyork deleted the exp-compat branch September 28, 2016 12:22
jacogr added a commit that referenced this pull request Sep 29, 2016
* master:
  Fixing Delegate Call in JIT (#2378)
  Prioritizing re-imported transactions (#2372)
  Revert #2172, pretty much. (#2387)
  correct sync memory usage calculation (#2385)
  Update gitlab-ci
  Fix the traceAddress field in transaction traces. (#2373)
  Removing extras data from retracted blocks. (#2375)
  fixed #2263, geth keys with ciphertext shorter than 32 bytes (#2318)
  Expanse compatibility (#2369)
  Specify column cache sizes explicitly; default fallback of 2MB (#2358)
  Canonical state cache (master) (#2311)
  make block queue into a more generic verification queue and fix block heap size calculation (#2095)
  Hash Content RPC method (#2355)
  Reorder transaction_by_hash to favour canon search (#2332)
  DIV optimization (#2327)
  Error when deserializing invalid hex (#2339)
  Changed http:// to https:// on some links (#2349)
  add a test
  fix migration system, better errors

# Conflicts:
#	.gitlab-ci.yml
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well. M4-core ⛓ Core client code / Rust.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants