scripted-diff: Rename key size consts to be relative to their class

Empact commented at 8:39 pm on February 16, 2018: member

~~And introduce CPubKeySig to host code relative to key sigs.~~

devrandom commented at 9:22 pm on February 16, 2018: none

utACK https://github.com/bitcoin/bitcoin/pull/12461/commits/b0e8b7269d934a0c58c0410017e2f958cd792c20

fanquake added the label Refactoring on Feb 17, 2018

in src/pubkey.h:29 in 3f457249c1 outdated

25@@ -26,40 +26,48 @@ class CKeyID : public uint160
26 
27 typedef uint256 ChainCode;
28 
29+class CPubKeySig

jonasschnelli commented at 11:11 am on February 17, 2018:

Why not a namespace?

jonasschnelli commented at 11:12 am on February 17, 2018: contributor

Concept ACK. Not sure if CPubKeySig needs its own space.

Empact force-pushed on Feb 19, 2018

Empact commented at 0:26 am on February 19, 2018: member

Thanks, made PubKeySig a namespace.

Empact force-pushed on Feb 20, 2018

Empact commented at 8:51 pm on February 20, 2018: member

On second thought, dropped PubKeySig - without any other code it’s barely a separate concern.

Empact renamed this:
~~Refactor key / signature size consts to be relative to their relevant class~~
Refactor key size consts to be relative to their relevant class
on Feb 20, 2018

instagibbs commented at 7:01 pm on February 26, 2018: member

seemingly unrelated travis error:

File “/home/travis/build/bitcoin/bitcoin/build/bitcoin-i686-pc-linux-gnu/test/functional/rpc_net.py”, line 54, in _test_getnettotals assert_equal(before[‘bytesrecv_per_msg’][‘pong’] + 32, after[‘bytesrecv_per_msg’][‘pong’])

kicked travis

Empact commented at 7:35 pm on February 26, 2018: member

@instagibbs thanks - seems like that is a timing-related failure, I pushed #12545 to increase the wait, and reduce the likelihood of spurious failures.

MarcoFalke commented at 1:10 am on March 19, 2018: member

Needs rebase if still relevant

Empact force-pushed on Mar 19, 2018

Empact commented at 7:01 am on March 21, 2018: member

Rebased

fanquake requested review from sipa on Mar 21, 2018

Empact force-pushed on Apr 12, 2018

Empact commented at 8:32 pm on April 12, 2018: member

Rebased & reimplemented as a scripted-diff

Empact renamed this:
~~Refactor key size consts to be relative to their relevant class~~
scripted-diff: Rename key size consts to be relative to their class
on Apr 12, 2018

Empact force-pushed on Apr 13, 2018

Empact force-pushed on Apr 17, 2018

sipa commented at 0:16 am on May 17, 2018: member

utACK f1583f26f2d9cb199ace6054a67797e1d4d9bed0

Empact force-pushed on Jun 1, 2018

Empact commented at 12:18 pm on June 1, 2018: member

Rebased and updated to cover #13194

Empact force-pushed on Jun 1, 2018

Empact force-pushed on Jul 17, 2018

Empact commented at 6:08 pm on July 17, 2018: member

Rebased to confirm scripted-diff still applies. It does. 👍

MarcoFalke commented at 6:04 pm on September 7, 2018: member

utACK 2dda5dd034, but please note that the scripted diff will modify files outside the git tree. I’d prefer to avoid that.

MarcoFalke closed this on Sep 7, 2018

MarcoFalke reopened this on Sep 7, 2018

Empact force-pushed on Sep 11, 2018

Empact commented at 4:55 am on September 11, 2018: member

Updated to include 2 new cases, and brought it down to a single sed call which only acts on files in the repo.

DrahtBot added the label Needs rebase on Sep 13, 2018

Empact force-pushed on Sep 15, 2018

Empact commented at 5:35 pm on September 15, 2018: member

Rebased for #14195

DrahtBot removed the label Needs rebase on Sep 15, 2018

in src/pubkey.h:37 in 40c69642bd outdated

32@@ -33,33 +33,33 @@ class CPubKey
33     /**
34      * secp256k1:
35      */
36-    static constexpr unsigned int PUBLIC_KEY_SIZE             = 65;
37-    static constexpr unsigned int COMPRESSED_PUBLIC_KEY_SIZE  = 33;
38+    static constexpr unsigned int SIZE             = 65;
39+    static constexpr unsigned int COMPRESSED_SIZE  = 33;

ken2812221 commented at 7:17 am on December 2, 2018:

nit: Could have another commit to fix the format here

ken2812221 approved

ken2812221 commented at 7:18 am on December 2, 2018: contributor

utACK 40c69642bd4bed49d17b75e3f544afbc8d10e8ae

DrahtBot commented at 12:50 pm on December 17, 2018: member

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#16463 ([BIP 174] Implement serialization support for GLOBAL_XPUB field. by achow101)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

DrahtBot added the label Needs rebase on Feb 14, 2019

Empact force-pushed on Mar 4, 2019

Empact commented at 9:28 am on March 4, 2019: member

Rebased, added a commit to fixup whitespace.

scripted-diff: Rename CPubKey and CKey::*_KEY_SIZE and COMPRESSED_*_KEY_SIZE

To SIZE and COMPRESSED_SIZE

-BEGIN VERIFY SCRIPT-
sed -i 's/PRIVATE_KEY_SIZE/SIZE/g' src/*.h src/*.cpp src/**/*.h src/**/*.cpp
sed -i 's/COMPRESSED_PRIVATE_KEY_SIZE/COMPRESSED_SIZE/g' src/*.h src/**/*.cpp src/**/*.h src/**/*.cpp
sed -i 's/PUBLIC_KEY_SIZE/SIZE/g' src/*.h src/*.cpp src/**/*.h src/**/*.cpp
sed -i 's/COMPRESSED_PUBLIC_KEY_SIZE/COMPRESSED_SIZE/g' src/*.h src/*.cpp src/**/*.h src/**/*.cpp
-END VERIFY SCRIPT-

47101bbb27

Fixup whitespace 0580f86bb4

Empact force-pushed on Mar 4, 2019

DrahtBot removed the label Needs rebase on Mar 4, 2019

meshcollider commented at 4:01 am on April 14, 2019: contributor

utACK https://github.com/bitcoin/bitcoin/pull/12461/commits/0580f86bb48004b797d4cb6273e7ffee0b0a0584

laanwj referenced this in commit 36191a8bb5 on Nov 20, 2019

laanwj merged this on Nov 20, 2019

laanwj closed this on Nov 20, 2019

sidhujag referenced this in commit 118ec28752 on Nov 20, 2019

jasonbcox referenced this in commit 64fb78dde1 on Oct 7, 2020

sidhujag referenced this in commit 1af8b4b2c2 on Nov 10, 2020

UdjinM6 referenced this in commit 81b8eb4083 on Aug 10, 2021

5tefan referenced this in commit da55971c71 on Aug 12, 2021

MarcoFalke locked this on Dec 16, 2021

scripted-diff: Rename key size consts to be relative to their class #12461

Conflicts