Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

local vs global chain_type (for better test isolation) #412

Merged
merged 9 commits into from
May 23, 2020

Conversation

antiochp
Copy link
Member

@antiochp antiochp commented May 22, 2020

Replaces #409 (closed due to merge/rebase problems).
Related mimblewimble/grin#3327

Grin PR mimblewimble/grin#3327 introduces (thread) local and global configuration of chain_type.
This PR makes the necessary changes in grin-wallet for compatibility.


Updated grin deps for latest master -

cargo update -p grin_core
    Updating git repository `https://github.com/mimblewimble/grin`
    Updating crates.io index
    Updating grin_api v4.0.0-alpha.1 (https://github.com/mimblewimble/grin#93f5de3d) -> #6faa0e8d
    Updating grin_chain v4.0.0-alpha.1 (https://github.com/mimblewimble/grin#93f5de3d) -> #6faa0e8d
    Updating grin_core v4.0.0-alpha.1 (https://github.com/mimblewimble/grin#93f5de3d) -> #6faa0e8d
    Updating grin_keychain v4.0.0-alpha.1 (https://github.com/mimblewimble/grin#93f5de3d) -> #6faa0e8d
    Updating grin_p2p v4.0.0-alpha.1 (https://github.com/mimblewimble/grin#93f5de3d) -> #6faa0e8d
    Updating grin_pool v4.0.0-alpha.1 (https://github.com/mimblewimble/grin#93f5de3d) -> #6faa0e8d
    Updating grin_store v4.0.0-alpha.1 (https://github.com/mimblewimble/grin#93f5de3d) -> #6faa0e8d
    Updating grin_util v4.0.0-alpha.1 (https://github.com/mimblewimble/grin#93f5de3d) -> #6faa0e8d

@yeastplume
Copy link
Member

Exact same code as earlier just passed - #417

Can you just merge from upstream once more? I've stopped the doctests running on windows, which should hopefully alleviate the problem

@yeastplume
Copy link
Member

I just merged via the web UI, hopefully this should pass and we can move on with our lives

@antiochp antiochp force-pushed the local_chain_type branch from 09d52cb to e368c4c Compare May 23, 2020 10:07
@antiochp
Copy link
Member Author

I just merged via the web UI, hopefully this should pass and we can move on with our lives

It's weird. The CI run prior to you merging actually passed on this PR...

@antiochp antiochp merged commit 038dafc into mimblewimble:master May 23, 2020
@antiochp antiochp deleted the local_chain_type branch May 23, 2020 10:47
antiochp added a commit to antiochp/grin-wallet that referenced this pull request Aug 7, 2020
local vs global chain_type (for better test isolation)
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.

2 participants