Page MenuHomePhabricator

Partial Merge #14454: ProcessImport() cleanup (excluding witness)
ClosedPublic

Authored by nakihito on May 12 2020, 23:11.

Diff Detail

Repository
rABC Bitcoin ABC
Branch
updateProcessImport
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 10731
Build 19254: Default Diff Build & Tests
Build 19253: Build without Wallet
Build 19252: arc lint + arc unit

Event Timeline

Owners added a reviewer: Restricted Owners Package.May 12 2020, 23:11
nakihito planned changes to this revision.

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

nakihito added inline comments.
src/wallet/rpcdump.cpp
1119–1123

This change is made in PR9332.

1253–1257

This is the reapplication of PR14679.

1269–1278

This is removed in PR9332.

1345–1355

This is removed in PR9332.

1396–1401

This is changed in PR9332, but then removed in PR14454.

test/functional/wallet_importmulti.py
94–107

This change was made in PR14454.

109–123

This change was made in PR9332.

163–177

This change was made in PR9332.

227–229

These changes were made in PR14454.

251–264

This change was made in PR9332.

nakihito edited the summary of this revision. (Show Details)

I started reviewing this but this is incredibly difficult. If the problem backport PR9332 is that some test is broken, isn't it possible to modify the PR slightly so that it doesn't break the test?

I started reviewing this but this is incredibly difficult. If the problem backport PR9332 is that some test is broken, isn't it possible to modify the PR slightly so that it doesn't break the test?

Looks like the importmulti function test is inconsistent on the machine I was using. I have uploaded D6061 which backports only a modified PR9332 which I tested on one of the dev boxes. I'll update this one to only backport the non-witness parts of PR14454.

nakihito retitled this revision from Merge #9332 and #14454: Let wallet importmulti RPC accept labels for standard scriptPubKeys and ProcessImport() cleanup to Partial Merge #14454: ProcessImport() cleanup (excluding witness).May 13 2020, 19:17
nakihito edited the summary of this revision. (Show Details)
nakihito edited the summary of this revision. (Show Details)

Moved PR9332 to its own patch (D6061) and rebased off it.

This revision is now accepted and ready to land.May 15 2020, 13:38