Page MenuHomePhabricator

Limit variable scope
ClosedPublic

Authored by nakihito on May 28 2019, 22:56.

Details

Reviewers
jasonbcox
deadalnix
Fabien
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Restricted Project
Commits
rSTAGING1b6adec5c141: Limit variable scope
rABC1b6adec5c141: Limit variable scope
Summary

Limit variable scope

Backport of Core PR10521
https://github.com/bitcoin/bitcoin/pull/10521

Test Plan
make check
test_runner.py

../configure --enable-debug
make check

Diff Detail

Repository
rABC Bitcoin ABC
Branch
BackportPR10521
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 6128
Build 10304: Bitcoin ABC Buildbot (legacy)
Build 10303: arc lint + arc unit

Event Timeline

Owners added a reviewer: Restricted Owners Package.May 28 2019, 22:56
jasonbcox requested changes to this revision.May 28 2019, 23:56
jasonbcox added inline comments.
src/crypto/aes.cpp
125 ↗(On Diff #8979)

uint8_t, just as it was before this patch

src/test/checkqueue_tests.cpp
388 ↗(On Diff #8979)

please investigate why this does not match the original PR pre-patch. It's functionally the same, but the line ordering is not.

src/wallet/db.cpp
494 ↗(On Diff #8979)

Missing backport here

src/wallet/wallet.cpp
3688 ↗(On Diff #8979)

This neither matches the backport PR nor provides any value by scoping the entire function. Leave this change out.

This revision now requires changes to proceed.May 28 2019, 23:56
nakihito planned changes to this revision.EditedMay 31 2019, 19:12
nakihito marked an inline comment as done.

Working on finding and backporting a dependency and will update this later.

src/test/checkqueue_tests.cpp
388 ↗(On Diff #8979)
src/wallet/db.cpp
494 ↗(On Diff #8979)

Working on this one now. Will update this after the dependency is completed.

src/wallet/wallet.cpp
3688 ↗(On Diff #8979)

Reverted.

src/test/checkqueue_tests.cpp
388 ↗(On Diff #8979)

Ok.

src/wallet/db.cpp
494 ↗(On Diff #8979)

Found the out of order backport: https://reviews.bitcoinabc.org/D2231

Reverted changes in wallet/wallet.cpp and fixed typing in crypto/aes.cpp.

src/wallet/db.cpp
494 ↗(On Diff #8979)

Thank you.

This revision is now accepted and ready to land.Jun 3 2019, 20:14