Skip to content

Return Weight type for max_weight_to_satisfy methods #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Mar 26, 2024
Merged

Return Weight type for max_weight_to_satisfy methods #664

merged 1 commit into from
Mar 26, 2024

Conversation

@yancyribbens
Copy link
Contributor

@yancyribbens yancyribbens commented Mar 23, 2024

Return Weight type for max_weight_to_satisfy methods.

@yancyribbens yancyribbens force-pushed the add-weight-type-to-satisfy-methods branch from 54ba5da to 3adf211 Compare March 23, 2024 18:23
@yancyribbens
Copy link
Contributor Author

yancyribbens commented Mar 23, 2024

I'm not sure if there should be a more specific error added or if there is a better one to use then the general one I picked here.

@apoelstra
Copy link
Member

apoelstra commented Mar 24, 2024

I'm not sure if there should be a more specific error added or if there is a better one to use then the general one I picked here.

Fine to use the general one for now. I have an ambitious PR in the works that will try to add span information etc to errors so any "extra" work you do now will just get overwritten when I finish that.

@apoelstra
Copy link
Member

apoelstra commented Mar 24, 2024

Could you rebase this though? The rebase will be trivial, it's just that #661 made me change the lockfiles in my local CI so now they don't work without it. (I could change them back on my end but I'm being lazy and I know you're comfortable rebasing stuff.)

utACK 3adf211

@yancyribbens yancyribbens force-pushed the add-weight-type-to-satisfy-methods branch from 3adf211 to be516fb Compare March 25, 2024 12:46
@yancyribbens
Copy link
Contributor Author

yancyribbens commented Mar 25, 2024

Rebased.

@apoelstra
Copy link
Member

apoelstra commented Mar 25, 2024

You need to run cargo +nightly fmt in this repo.

@yancyribbens yancyribbens force-pushed the add-weight-type-to-satisfy-methods branch from be516fb to fac615d Compare March 25, 2024 15:43
@yancyribbens
Copy link
Contributor Author

yancyribbens commented Mar 25, 2024

You need to run cargo +nightly fmt in this repo.

Thanks, done.

@yancyribbens yancyribbens force-pushed the add-weight-type-to-satisfy-methods branch 2 times, most recently from 7615aed to f04c7c6 Compare March 25, 2024 16:29
@apoelstra
Copy link
Member

apoelstra commented Mar 25, 2024

Now this appears to be based on the tip of #661 rather than on master.

@apoelstra apoelstra mentioned this pull request Mar 25, 2024
Closed
@yancyribbens yancyribbens force-pushed the add-weight-type-to-satisfy-methods branch from f04c7c6 to 7c5f3dc Compare March 25, 2024 22:52
@yancyribbens
Copy link
Contributor Author

yancyribbens commented Mar 25, 2024

Now this appears to be based on the tip of #661 rather than on master.

Now sure how I managed that. I'm now showing 4aaedf is now the previous commit.

apoelstra
apoelstra approved these changes Mar 26, 2024
View reviewed changes
Copy link
Member

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

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

ACK 7c5f3dc

@apoelstra apoelstra merged commit fb3f36a into rust-bitcoin:master Mar 26, 2024
@yancyribbens yancyribbens mentioned this pull request Mar 26, 2024
Closed
heap-coder added a commit to heap-coder/rust-miniscript that referenced this pull request Sep 27, 2025
@heap-coder
Merge rust-bitcoin/rust-miniscript#664: Return Weight type for max_we…
2a31677 
…ight_to_satisfy methods

7c5f3dc5b54373c12cad430d356f29bce33e9dc4 Return Weight type for max_weight_to_satisfy methods (yancy)

Pull request description:

  Return Weight type for max_weight_to_satisfy methods.

ACKs for top commit:
  apoelstra:
    ACK 7c5f3dc5b54373c12cad430d356f29bce33e9dc4

Tree-SHA512: 7e6f32dc1f55927b90ed739f54460546229f1958136bf67418fd738f30c51f674469cf69d2b24cf5e8ff99b152461b289682446f881f6ad6640deb057e3624d3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@apoelstra apoelstra apoelstra approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@yancyribbens @apoelstra