Skip to content

revert #3036, #2911, #1879, #1432: revert dashification of filenames - #4478

Merged
PastaPastaPasta merged 5 commits into
dashpay:developfrom
kwvg:undashify
Aug 11, 2022
Merged

revert #3036, #2911, #1879, #1432: revert dashification of filenames#4478
PastaPastaPasta merged 5 commits into
dashpay:developfrom
kwvg:undashify

Conversation

@kwvg

@kwvgkwvg commented Oct 2, 2021•
edited
Loading

Copy link
Copy Markdown
Collaborator

Why?

As we're planning to support multiple build systems, remaining inline with their origin projects are a priority and surface-level filename rebranding serves as a quick and easy way to cause merge conflicts. We aim to remedy that. No logic or user-visible strings have been changed (outside of documentation)

Some filenames in the codebase will have the Dash branding, others don't. Only sources file that have a tendency to undergo change or are used by files that tend to undergo change were considered for the revert

Why not?

We now have an inconsistent naming scheme, despite being named bitcoinconsensus, it will still output the libdashconsensus library

@kwvgkwvg changed the title revert #3036, #2911, #1879, #1432: revert dashification of library and source namesrevert #3036, #2911, #1879, #1432: revert dashification of (library) source namesOct 2, 2021
@github-actions

github-actionsBot commented Oct 10, 2021

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@github-actions

github-actionsBot commented Oct 13, 2021

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@github-actions

github-actionsBot commented Dec 30, 2021

Copy link
Copy Markdown

This Pull Request may conflict if the Pull Requests below are merged first.

#4649
conflictable files: src/interfaces/node.cpp

@github-actionsgithub-actionsBot mentioned this pull request Dec 30, 2021
Merged
@kwvg
kwvg marked this pull request as draft February 27, 2022 10:02
@kwvgkwvg changed the title revert #3036, #2911, #1879, #1432: revert dashification of (library) source namesrevert #3036, #2911, #1879, #1432: revert dashification of filenamesJul 8, 2022
@kwvg
kwvg marked this pull request as ready for review July 8, 2022 08:50
@github-actions

github-actionsBot commented Jul 13, 2022

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

PastaPastaPasta
PastaPastaPasta previously approved these changes Jul 28, 2022
View reviewed changes

@PastaPastaPastaPastaPastaPasta left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

utACK for squash merge assuming it passes CI

PastaPastaPasta
PastaPastaPasta previously approved these changes Jul 28, 2022
View reviewed changes

@PastaPastaPastaPastaPastaPasta left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

re-utACK

@UdjinM6

UdjinM6 commented Jul 29, 2022

Copy link
Copy Markdown

We now have an inconsistent naming scheme, ...

yeah... not sure I like it

despite being named bitcoinconsensus, it will still output the libdashconsensus library

this exact example is 1. not true and 2. it's a shared lib which is a bit more complex case, see dbc0474634

also, see few trivial fixes a9b9c2d209

@UdjinM6

UdjinM6 commented Aug 8, 2022

Copy link
Copy Markdown

pls rebase to include #4957

UdjinM6
UdjinM6 approved these changes Aug 9, 2022
View reviewed changes

@UdjinM6UdjinM6 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM, utACK

PastaPastaPasta
PastaPastaPasta approved these changes Aug 11, 2022
View reviewed changes

@PastaPastaPastaPastaPastaPasta left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

utACK for merging via merge commit

@PastaPastaPasta
PastaPastaPasta merged commit f83d857 into dashpay:developAug 11, 2022
@kwvgkwvg mentioned this pull request Nov 2, 2022
Closed
@UdjinM6UdjinM6 added this to the 18.1 milestone Sep 6, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes
@PastaPastaPastaPastaPastaPastaPastaPastaPasta approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

18.1

Development

Successfully merging this pull request may close these issues.

3 participants

@kwvg@UdjinM6@PastaPastaPasta