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

Bumping serde & syntex #1216

Merged
merged 9 commits into from
Jun 6, 2016
Merged

Bumping serde & syntex #1216

merged 9 commits into from
Jun 6, 2016

Conversation

tomusdrw
Copy link
Collaborator

@tomusdrw tomusdrw commented Jun 2, 2016

in all our dependencies.

  • Fixes in jsonrpc-http-server

@tomusdrw tomusdrw added the A0-pleasereview 🤓 Pull request needs code review. label Jun 2, 2016
@NikVolf
Copy link
Contributor

NikVolf commented Jun 2, 2016

This is funny failing test
because i already encountered it once and don't see why it is working in master
i have also open pr to ethereum/tests because json is clearly malformed there

ethereum/tests#113

@NikVolf NikVolf added A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jun 2, 2016
@tomusdrw
Copy link
Collaborator Author

tomusdrw commented Jun 3, 2016

Not really sure what do now.

  1. Should I ignore the tests?
  2. Should I fork the tests and change our submodule?

Thoughts?

@NikVolf
Copy link
Contributor

NikVolf commented Jun 3, 2016

i think disabling this test until it is fixed on ethereum side is fine

Tomasz Drwięga added 2 commits June 6, 2016 10:10
Conflicts:
	ethcore/src/types/state_diff.rs
@tomusdrw tomusdrw added A0-pleasereview 🤓 Pull request needs code review. and removed A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. labels Jun 6, 2016
@debris debris merged commit b93c83b into master Jun 6, 2016
@debris debris deleted the serde-bump branch June 6, 2016 09:32
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-pleasereview 🤓 Pull request needs code review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants