Differential D3146

Limit variable scope
ClosedPublic
Actions

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

Tags

None

Subscribers

None

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 6105
Build 10258: Bitcoin ABC Buildbot (legacy)
Build 10257: arc lint + arc unit

Event Timeline

nakihito created this revision.May 28 2019, 22:56

Owners added a reviewer: Restricted Owners Package.May 28 2019, 22:56

Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 28 2019, 22:56

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Harbormaster completed remote builds in B6044: Diff 8979.May 28 2019, 23:10

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

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

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

src/test/checkqueue_tests.cpp
388 ↗	(On Diff #8979)	Comparing https://reviews.bitcoinabc.org/D1771 with https://github.com/bitcoin/bitcoin/pull/9497/commits/96c7f2c3458950061b057fcd3daaf47b57e6bac7, and it looks like it was added that way.
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.

jasonbcox added inline comments.May 31 2019, 23:32

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

nakihito added inline comments.Jun 1 2019, 00:51

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.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B6105: Diff 9054.Jun 1 2019, 01:45

deadalnix accepted this revision.Jun 2 2019, 23:27

Fabien accepted this revision.Jun 3 2019, 07:06

jasonbcox added inline comments.Jun 3 2019, 17:35

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

Rebased.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B6128: Diff 9098.Jun 3 2019, 20:12

jasonbcox accepted this revision.Jun 3 2019, 20:14

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

Closed by commit rABC1b6adec5c141: Limit variable scope (authored by practicalswift <practicalswift@users.noreply.github.com>, committed by nakihito). · Explain WhyJun 3 2019, 20:44

This revision was automatically updated to reflect the committed changes.

Nico Guiton <nico@bitframe.org> added a commit: rABC1b6adec5c141: Limit variable scope.

Fabien mentioned this in D3598: Fix checkqueue_tests use-after-scope.Jul 8 2019, 20:45

Fabien mentioned this in rABCc9911ddd7dc2: Fix checkqueue_tests use-after-scope.Jul 9 2019, 05:56

Nico Guiton <nico@bitframe.org> added a commit: rSTAGING1b6adec5c141: Limit variable scope.Sep 18 2019, 23:58

Fabien mentioned this in rSTAGINGc9911ddd7dc2: Fix checkqueue_tests use-after-scope.Sep 19 2019, 01:05

nakihito mentioned this in T611: Backport Core PR 10521: Limit variable scope.Dec 16 2019, 22:55

Revision Contents
Changeset List

Path

Size

src/

crypto/

3 lines

qt/

coincontroltreewidget.cpp

5 lines

recentrequeststablemodel.cpp

3 lines

trafficgraphwidget.cpp

7 lines

rpc/

6 lines

rawtransaction.cpp

2 lines

script/

3 lines

test/

checkqueue_tests.cpp

8 lines

wallet/

2 lines

Diff 9054

src/crypto/aes.cpp

Loading...

src/qt/coincontroltreewidget.cpp

Loading...

src/qt/recentrequeststablemodel.cpp

Loading...

src/qt/trafficgraphwidget.cpp

Loading...

src/rpc/mining.cpp

Loading...

src/rpc/rawtransaction.cpp

Loading...

src/script/sign.cpp

Loading...

src/test/checkqueue_tests.cpp

Loading...

src/wallet/db.cpp

Loading...