HomePhabricator

Fix for rebase/merge failure
1d1ce9ab25e0Unpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Fix for rebase/merge failure

Summary:
Fixes 39fe309bab18c7e00a66e9f97a2cf47f7fc6d30d.
LoadExternalBlockFile(..) takes chain parameters out of
the config object now, so the signature changed
correspondingly.

Test Plan: `src/test/test_bitcoin -t validation_tests```

Reviewers: kyuupichan, freetrader, sickpig, deadalnix, #bitcoin_abc

Reviewed By: deadalnix, #bitcoin_abc

Differential Revision: https://reviews.bitcoinabc.org/D192

Details

Provenance
awemanyAuthored on Jun 13 2017, 20:13
schancelPushed on Jan 5 2018, 21:58
schancelPushed on Jan 5 2018, 21:39
schancelPushed on Jan 5 2018, 21:17
Reviewer
Restricted Project
Differential Revision
D192: Fix for rebase/merge failure
Parents
rSTAGINGd510fbaaff2f: Format mempool_tests.cpp
Branches
Unknown
Tags
Unknown