--- Log opened Sat Nov 09 00:00:45 2024
04:06 -!- brunoerg [~brunoerg@187.60.227.242] has joined ##miniscript
04:11 -!- brunoerg [~brunoerg@187.60.227.242] has quit [Ping timeout: 252 seconds]
05:02 -!- brunoerg [~brunoerg@187.60.227.242] has joined ##miniscript
05:07 -!- brunoerg [~brunoerg@187.60.227.242] has quit [Ping timeout: 260 seconds]
07:09 < Tidwell> Hey andytoshi, when I'm doing edits for the PR, should I make a new commit showing the updates based on the suggestions before squashing into 1 commit? or should I squash immediately on the next commit?
07:11 <@andytoshi> Tidwell: best to squash immediately
07:12 <@andytoshi> i can use git-range-diff to see the changes
09:01 <@andytoshi> Tidwell: thanks for iterating! this latest one looks great. definitely our most interesting/thorough example
09:01 <@andytoshi> there is a CI failure because of clippy which looks easy to fix
09:01 <@andytoshi> i likely won't be able to ack/merge this weekend because my CI box is doing a test run for simplicity that roconnor claims will take 3 days
09:01 < Tidwell> shucks, looks like im still not replicating the ci linter/clippy correctly then
09:01 <@andytoshi> aad i am only 18 hours in
09:02 <@andytoshi> lemme see if i can repro this one
09:02 <@andytoshi> heh, `cargo +nightly clippy --all-features --all-targets` shows a different warning than the one in CI
09:03 <@andytoshi> trying `rustup update nightly`
09:03 <@andytoshi> there are new clippy lints pretty-much every month now ... in CI we pin our nightly compiler, and regularly update the pin, fixing stuff as they appear
09:04 <@andytoshi> yep, there we go
09:04 <@andytoshi> Tidwell: cargo +nightly clippy --all-features --all-targets
09:04 <@andytoshi> but you need a pretty recent nightly compiler installed
09:05 < Tidwell> im looking at the error, I may be misinterrupting it, but it seems like this is a miniscript issue `src/policy/compiler.rs:696:10`
09:05 <@andytoshi> oh lol, you're right
09:05 <@andytoshi> ok, apparently we don't pin it
09:05 <@andytoshi> we do in rust-bitcoin ... we need to start doing it in rust-miniscript too
09:05 <@andytoshi> Tidwell: i see one other warning though, which i'd like you to fix, that is in your code
09:06 <@andytoshi> examples/taptree_of_horror/helper_fns.rs:24:48
09:06 <@andytoshi> let preimage_256_hash = sha256::Hash::hash(&prepreimage);
09:06 <@andytoshi> you should drop the &
09:06 <@andytoshi> CI will still fail because of the clippy issue on master ... if you're in a generous mood you could add a commit which fixes that too
09:07 <@andytoshi> i will open a PR to do this
09:08 <@andytoshi> https://github.com/rust-bitcoin/rust-miniscript/pull/768
09:09 < Tidwell> you're a bit faster than I am. im operating at win95 pace
09:10 <@andytoshi> hehe. i've got a lot of owrkflows dialed in
09:11 <@andytoshi> ..though apparently not dialed-in enough to get ci to pass on the first try (had to run the formatter..)
09:16 < Tidwell> Going back to what you said earlier, why would it matter if your ci box is saturated with simplicity stuff, we are using github ci compute for miniscript?, so unsure what the blocker would potentially be.
09:19 -!- brunoerg [~brunoerg@187.60.227.242] has joined ##miniscript
09:20 <@andytoshi> my CI is way more thorough
09:20 <@andytoshi> it tests every commit with like a hundred different feature combinations
09:21 <@andytoshi> github CI has some linters and stuff that i don't have locally (though for miniscript, maybe that's not even true..); it can run on different arches and do embedded stuff
09:33 -!- brunoerg [~brunoerg@187.60.227.242] has quit [Remote host closed the connection]
09:42 < Tidwell> I'm not seeing the warnings or other issues you were talking about outside of the error your PR addresses. I'm thinking I just rebase my PR off yours and I'll be good?
09:45 <@andytoshi> Tidwell: yep, that'd work
09:45 <@andytoshi> well, you also need to remove the & from line 24 of helper_fns.rs
10:03 < Tidwell> I have a git question here, my PR should contain your commit as part of my total commits? so I would have 2 commits instead of 1? 
10:03 <@andytoshi> Tidwell: yeah
10:03 <@andytoshi> and it shouldn't contain any merge commit
10:03 < Tidwell> and then after you pull in your changes.. my PR automagically would show 1 commit ?
10:03 <@andytoshi> yep
10:04 < Tidwell> ok, git is by far harder than rust i think.. lol.. but im learning. i need to redo my commit stuff for my PR it's in a bit of a misordered mess 
10:06 <@andytoshi> heh yeah, git's UX is a real clusterfuck
10:07 <@andytoshi> Tidwell: i think you can do `git rebase -i master d28b7ea2cff8285a21fa4e850dcbb600b2dfd356` then edit the list so that it's just picking your one commit
10:07 <@andytoshi> if you get confused or scared just erase every line and save-quit and it'll do nothing
10:19 < Tidwell> i think* this looks ok https://github.com/rust-bitcoin/rust-miniscript/pull/766/commits
10:23 <@andytoshi> Tidwell: it looks ok, though it pulls in both 767 and 768
10:23 <@andytoshi> you need only 768
10:53 -!- brunoerg [~brunoerg@187.60.227.242] has joined ##miniscript
10:56 -!- brunoerg [~brunoerg@187.60.227.242] has quit [Remote host closed the connection]
11:47 -!- brunoerg [~brunoerg@187.60.227.242] has joined ##miniscript
11:52 -!- brunoerg [~brunoerg@187.60.227.242] has quit [Ping timeout: 255 seconds]
12:32 < Tidwell> i feel like i leveled up a few times today with git. I think the PR looks good, same commit hash and we aren't both authors of your commit now, but if I'm curious to know if it's still an issue where it looks like I'm pulling in both 767 and 768, if so, I'm not sure how you are seeing this. 
12:36 < Tidwell> also note, ideally* im trying to get this merged in before the 3 year anniversary of taproot activation. I was planning on making a youtube video that mentions this PR/puzzle and it would be cool if it was in the codebase by then. (Nov 14) was activation day ~5 days away.
12:45 <@andytoshi> oh nice
12:45 <@andytoshi> we'll definitely get it in before the 14th. i can expedite things if need be
12:46 <@andytoshi> 6910eb4b76bb84e53aea65a7bb707e27516a473f looks perfect to me
14:32 -!- Tidwell [~Tidwell@2600:1700:fc5:38b0:5c99:dd42:16bc:3052] has quit [Remote host closed the connection]
14:33 -!- Tidwell [~Tidwell@2600:1700:fc5:38b0:d026:e858:1102:41a0] has joined ##miniscript
19:05 -!- brunoerg [~brunoerg@2804:14c:4a:9e33:a0d7:f099:141f:8c63] has joined ##miniscript
19:09 -!- brunoerg [~brunoerg@2804:14c:4a:9e33:a0d7:f099:141f:8c63] has quit [Ping timeout: 246 seconds]
19:57 -!- brunoerg [~brunoerg@2804:14c:4a:9e33:a0d7:f099:141f:8c63] has joined ##miniscript
20:02 -!- brunoerg [~brunoerg@2804:14c:4a:9e33:a0d7:f099:141f:8c63] has quit [Ping timeout: 276 seconds]
22:24 -!- brunoerg [~brunoerg@2804:14c:4a:9e33:a0d7:f099:141f:8c63] has joined ##miniscript
22:30 -!- brunoerg [~brunoerg@2804:14c:4a:9e33:a0d7:f099:141f:8c63] has quit [Ping timeout: 248 seconds]
23:19 -!- brunoerg [~brunoerg@2804:14c:4a:9e33:a0d7:f099:141f:8c63] has joined ##miniscript
23:25 -!- brunoerg [~brunoerg@2804:14c:4a:9e33:a0d7:f099:141f:8c63] has quit [Ping timeout: 276 seconds]
23:58 -!- brunoerg [~brunoerg@189.62.47.9] has joined ##miniscript
--- Log closed Sun Nov 10 00:00:46 2024