Skip to content

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Nov 19, 2023

The serialize version is unused, so remove it. This also allows to remove GCS_SER_VERSION and allows a scripted-diff to remove most of CDataStream.

@DrahtBot
Copy link
Contributor

DrahtBot commented Nov 19, 2023

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

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK ryanofsky, ajtowns

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #28333 (wallet: Construct ScriptPubKeyMans with all data rather than loaded progressively by achow101)
  • #26728 (wallet: Have the wallet store the key for automatically generated descriptors by achow101)
  • #25907 (wallet: rpc to add automatically generated descriptors 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.

@ajtowns
Copy link
Contributor

ajtowns commented Nov 20, 2023

Shares its first commit with #28892

MarcoFalke added 2 commits November 28, 2023 12:42
The field is unused, so remove it.

This is also required for future commits.
The remaining places are handled easier outside a scripted-diff.

-BEGIN VERIFY SCRIPT-
 sed --regexp-extended -i 's/CDataStream ([0-9a-zA-Z_]+)\(SER_[A-Z]+, [A-Z_]+_VERSION\);/DataStream \1{};/g' $( git grep -l CDataStream)
 sed -i 's/, CDataStream/, DataStream/g' src/wallet/walletdb.cpp
-END VERIFY SCRIPT-
@maflcko maflcko marked this pull request as ready for review November 28, 2023 11:43
@fanquake fanquake requested a review from theuni November 28, 2023 13:20
Copy link
Contributor

@ryanofsky ryanofsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code review ACK fae76a1

@ryanofsky
Copy link
Contributor

What are the places where CDataStream is still needed after this and what will happen to these?

@fanquake
Copy link
Member

Should end up removed completely in #28451.

@ajtowns
Copy link
Contributor

ajtowns commented Nov 28, 2023

ACK fae76a1

@fanquake fanquake merged commit fe4e83f into bitcoin:master Nov 28, 2023
@maflcko maflcko deleted the 2311-less-version- branch November 28, 2023 17:43
@bitcoin bitcoin locked and limited conversation to collaborators Nov 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants