--- Day changed Thu Sep 21 2017
00:04 -!- fredrin [~fredrin@gore.copyleft.no] has joined #joinmarket     
00:06 -!- Rix [~rix@unaffiliated/rix] has quit [Quit: no one lives forever]     
00:06 -!- Rix [~rix@bnc.vps.bg] has joined #joinmarket     
00:06 -!- Rix [~rix@bnc.vps.bg] has quit [Changing host]     
00:06 -!- Rix [~rix@unaffiliated/rix] has joined #joinmarket     
00:38 < waxwing> delinquentme, you're working off the instructions on the testing wiki page right?
03:36 -!- Michail1 [~michail@michail.com] has quit [Ping timeout: 240 seconds]     
03:39 -!- Michail1 [~michail@2603:3023:a04:2900:217:a4ff:fef0:e3fc] has joined #joinmarket     
04:09 -!- lnostdal [~lnostdal@77.70.119.51] has quit [Quit: lnostdal]     
04:10 -!- fredrin [~fredrin@gore.copyleft.no] has quit [Quit: leaving]     
04:11 < waxwing> belcher, sorry was busy squashing a fiendish bug, will take a look at your padding thing next
04:11 < belcher> :)     
04:11 < waxwing> (said bug was basically kinda the same as the *other* one i mentioned a day or two back: 'wallet_synced' state was not up to date)
04:12 -!- lnostdal [~lnostdal@77.70.119.51] has joined #joinmarket     
04:12 < waxwing> how it manifested here was, right click and 'resync wallet' on Qt, results in weird half-synced wallet.
04:12 < waxwing> because forgot to set self.wallet_synced to False in sync_wallet() function.
04:12 < waxwing> should have been tidier about setting state of BlockchainInterface object from the start.
04:13 < waxwing> so i'll look at the code in a mo', but is anyone up for writing a set of tests of our usage of Mnemonic with some test vectors, then also add some tests of encrypt/decrypt wallet file with new style.
04:14 < waxwing> there is stuff already in test_wallets, but it got messier and messier. still it can act as a base.
04:15 < GitHub94> [joinmarket-clientserver] AdamISZ pushed 1 new commit to master: https://git.io/vdefC
04:15 < GitHub94> joinmarket-clientserver/master b10cbe9 AdamISZ: Fix bugs in electrum wallet sync:...
04:33 < waxwing> belcher, 5 aes blocks (not including IV), that's 80 bytes, you have 8 bytes checksum and two separator bytes, isn't that 70 remaining? i've dropped one, you mentioned 69 in the scrollback
04:35 < belcher> it seems when you use 70 then it requires in 6 aes blocks
04:36 < waxwing> ah so you're leaving 1 over, yes that's right
04:36 < waxwing> if you fill exactly the AES block you get one whole extra block of padding
04:37 < waxwing> we have this in the seed encryption - you get 2 blocks, with 16 bytes exactly filling the block (128 bits)
04:37 < waxwing> i remember checking that out because it was confusing, before
04:37 < belcher> i got this experimentally, did for i in range(120): print('len='+str(i)+' aeslen='+str(len(encryptData(key, 'a'*i))))
04:38 < waxwing> so that works fine then to have it be 79 max.
04:39 < waxwing> well or 79 min, rather
04:39 < waxwing> oh hang on what if they enter something longer?
04:39 < belcher> you just get a longer ciphertext
04:40 < waxwing> i think it'll throw an exception for calling os.urandom(negative), unless it's checked elsewhere?
04:40 < belcher> they reveal that their mn extension is >69 or something
04:40 < belcher> oh     
04:40 < belcher> ok ill add that
04:41 < belcher> yes i just made it crash with a longer word
04:41 < waxwing> yeah we don't want to be one of those infamous developers that castigates a user with "your password is too long" :)
04:42 < waxwing> the best one is "exactly 8 characters" .. apparently some bank actually did that. well, maybe a bank, don't remember.
04:43 < waxwing> although hmm maybe 70 actually *is* too long after all :)
04:43 < belcher> ok     
04:43 < belcher> what happens when its too long?
04:44 < waxwing> i was just kind of joking. i can't see a good reason for passwords that have more than like 256 bits of entropy, maybe it's just me.
04:44 < belcher> length doesnt have to mean entropy
04:45 < belcher> anyway i pushed a new commit
04:45 < waxwing> yes very good point, not the same thing!
04:49 < waxwing> latest fun and games is 'libsodium was not built' https://travis-ci.org/JoinMarket-Org/joinmarket-clientserver/builds/278140647#L1055
04:49 < waxwing> we should chase up arubi 's link on travis stuff, posting it here because my stupid hexchat didn't save logs by default https://blog.travis-ci.com/2017-08-29-trusty-image-updates
05:05 -!- arubi [~ese168@gateway/tor-sasl/ese168] has quit [Read error: Connection reset by peer]     
05:20 < waxwing> belcher, made a small comment/Q . don't see anything else apart from that quibble.
05:21 < belcher> i replied
05:21 < belcher> its user-inputted data so always worth checking
05:21 < waxwing> weird i'm not getting records in yigen-statement today. haven't changed the yg script i'm using. some kind of strange bug.
05:21 < waxwing> belcher, right but why 2, it always should come out as length 3
05:22 < belcher> checking for 2 is because below that it would crash on chunks[1]
05:23 < waxwing> right, gotcha. but i think it should always be 3 if well formed, so 3 perhaps.
05:23 < belcher> ok ill edit
05:24 < belcher> done
05:37 -!- arubi [~ese168@gateway/tor-sasl/ese168] has joined #joinmarket     
05:43 -!- takamatsu [~takamatsu@unaffiliated/takamatsu] has joined #joinmarket     
06:02 < waxwing> belcher, un petit bug-ette :) (see github)
06:02 < belcher> lol, ty
06:03 < belcher> fix'd
06:10 -!- Giszmo [~leo@reverso.156.228.153.190.static.operaciones.gtdinternet.com] has joined #joinmarket     
06:15 < waxwing> one more nit (from playing around with it)
06:16 < belcher> just saw it
06:16 < belcher> pushed
06:17 < waxwing> does it apply on creation too? i'm looking again now. i know there was a strip() somewhere, depends where it is
06:18 < belcher> i put it in wallet_generate_recover_bip39() so it happens in generating and recovery
06:18 < waxwing> me from generate and from recover are using different callbacks
06:19 < waxwing> cli_get_mnemonic_extension returns raw_input's return unstripped
06:20 < belcher> the strip() happens after the callback
06:20 < belcher> mnemonic_extension = callbacks[4]() or words, mnemonic_extension = callbacks[1]()
06:20 < belcher> then later
06:20 < belcher>     if mnemonic_extension:
06:20 < belcher>         mnemonic_extension = mnemonic_extension.strip()
06:22 < waxwing> oh is that in the latest edit? i was looking at my IDE, don't see it there
06:22 < waxwing> ah yes, latest edit, gotcha.
06:22 < belcher> it takes a few seconds to refresh i guess
06:23 < waxwing> no it's just me reading my local code instead of github (find it a bit more convenient), didn't bother to pull latest, sorry
06:33 < waxwing> seems to be working for the scenarios i'm coming up with so far
06:33 < waxwing> what about checking bytes are < 128?
06:37 < belcher> so like
06:37 < belcher> all([a > '\x19' and a < '\x7f' for a in mnemonic_extension]) ?
06:38 < belcher> thats the range of printable ascii characters btw
06:39 < waxwing> yes, that looks good to me. i might knock together a short test function for this type of wallet file based on what was there before for the old type
06:40 -!- Giszmo [~leo@reverso.156.228.153.190.static.operaciones.gtdinternet.com] has quit [Ping timeout: 246 seconds]     
06:40 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
06:42 < waxwing> huh, test_wallets can't work right now anyway, since entropy_to_seed was renamed
06:43 < belcher> added the all ascii printable check
06:44 < GitHub74> [joinmarket-clientserver] adlai pushed 1 new commit to master: https://git.io/vdeCv
06:44 < GitHub74> joinmarket-clientserver/master 2215318 Adlai Chandrasekhar: fix indentations in ROI calculation
06:53 < waxwing> ok it's passing the old `test_wallet_create` with that one function name change, that's a good sign
06:53 -!- Giszmo [~leo@ip-238-236-219-201.nextelmovil.cl] has joined #joinmarket     
06:56 < waxwing> of course, other advantage of callbacks based input: easy to make test functions with custom callbacks ;)
07:00 -!- headcase [~headcase@unaffiliated/headcase] has quit [Remote host closed the connection]     
07:05 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
07:07 < belcher> absolutely :)
07:11 -!- headcase [~headcase@unaffiliated/headcase] has quit [Ping timeout: 248 seconds]     
07:14 -!- MaxSan [~one@185.156.175.171] has joined #joinmarket     
07:19 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
07:44 < waxwing> oh great, travis gets better and better
07:44 < waxwing> https://travis-ci.org/JoinMarket-Org/joinmarket-clientserver/builds/278190722#L3338
07:44 < waxwing> arubi, ping can you make any sense of that? build passed but 3 tests failed?
07:44 < waxwing> i wouldn't have noticed except i knew test_wallets couldn't possibly pass.
08:16 < arubi> waxwing, ah I see
08:19 -!- Giszmo [~leo@ip-238-236-219-201.nextelmovil.cl] has quit [Ping timeout: 255 seconds]     
08:37 < GitHub51> [joinmarket-clientserver] fivepiece opened pull request #87: return pytest return value in run_tests.sh (master...return_pytest) https://git.io/vderQ
08:37 -!- headcase [~headcase@unaffiliated/headcase] has quit [Remote host closed the connection]     
08:37 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
08:47 -!- Giszmo [~leo@reverso.156.228.153.190.static.operaciones.gtdinternet.com] has joined #joinmarket     
09:00 -!- headcase [~headcase@unaffiliated/headcase] has quit [Remote host closed the connection]     
09:01 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
09:34 -!- headcase [~headcase@unaffiliated/headcase] has quit [Remote host closed the connection]     
09:34 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
09:40 -!- headcase [~headcase@unaffiliated/headcase] has quit [Ping timeout: 246 seconds]     
09:46 -!- Giszmo [~leo@reverso.156.228.153.190.static.operaciones.gtdinternet.com] has quit [Ping timeout: 248 seconds]     
10:00 -!- coins123 [~coins123@unaffiliated/coins123] has quit []     
10:05 -!- Giszmo [~leo@reverso.156.228.153.190.static.operaciones.gtdinternet.com] has joined #joinmarket     
10:07 -!- MaxSan [~one@185.156.175.171] has quit [Ping timeout: 246 seconds]     
10:09 -!- MaxSan [~one@185.156.175.43] has joined #joinmarket     
10:37 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
10:41 -!- headcase [~headcase@unaffiliated/headcase] has quit [Ping timeout: 248 seconds]     
10:43 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
10:47 -!- headcase [~headcase@unaffiliated/headcase] has quit [Ping timeout: 252 seconds]     
10:49 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
10:53 -!- headcase [~headcase@unaffiliated/headcase] has quit [Ping timeout: 252 seconds]     
11:13 -!- Giszmo [~leo@reverso.156.228.153.190.static.operaciones.gtdinternet.com] has quit [Ping timeout: 240 seconds]     
11:30 -!- Giszmo [~leo@reverso.156.228.153.190.static.operaciones.gtdinternet.com] has joined #joinmarket     
11:43 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
11:46 -!- delinquentme [~delinquen@2602:306:ceb7:990:cdf7:d527:d537:2e8c] has quit [Ping timeout: 255 seconds]     
11:56 -!- delinquentme [~delinquen@c-73-71-127-234.hsd1.ca.comcast.net] has joined #joinmarket     
11:57 < delinquentme> waxwing, yeah. And updating as I go ... at least for joinmarket vanilla.  Ill make a few notes on some of the crazy I ran into last night.
12:00 -!- headcase [~headcase@unaffiliated/headcase] has quit [Remote host closed the connection]     
12:00 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
12:03 -!- delinquentme_ [~delinquen@173-132-48-142.pools.spcsdns.net] has joined #joinmarket     
12:04 -!- headcase [~headcase@unaffiliated/headcase] has quit [Ping timeout: 260 seconds]     
12:05 -!- delinquentme [~delinquen@c-73-71-127-234.hsd1.ca.comcast.net] has quit [Ping timeout: 255 seconds]     
12:09 < belcher> oh ffs
12:09 < belcher> help i messed up the rebasing
12:09 < belcher> https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/84/commits
12:11 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
12:11 < belcher> i did git rebase -i HEAD~10 to see all the latest 10 commits and then squashed the last 5 of them, but it looks like the other 5 were touched by my account too
12:12 < belcher> it might be simplest to close the PR, reupload the files and open a new PR ?
12:12 < delinquentme_> You're doing the rebase locally belcher?
12:12 < belcher> yes, then i do git push
12:12 < delinquentme_> are you just trying to squash the commits into a single?
12:13 < delinquentme_> can you give me your terminal output from the rebase command?
12:13 < belcher> $ git rebase -i HEAD~10
12:13 < belcher> [detached HEAD 86ff9f6] added optional feature to use mnemonic passphrases to create two factor recovery phrases
12:13 < belcher>  Date: Mon Sep 18 21:05:19 2017 +0100
12:13 < belcher>  3 files changed, 166 insertions(+), 59 deletions(-)
12:13 < belcher> Successfully rebased and updated refs/heads/master.
12:13 < delinquentme_> and are you using nano or vim for the editing of the ... logs?
12:13 < belcher> vim     
12:14 < belcher> look at this link https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/84/commits it somehow involved my account with waxwing's earlier commits
12:15 < delinquentme_> You were working atop his commits it looks like? And I see a total of 7 commits here ...
12:16 < delinquentme_> so it looks like you rebased successfully?  You just didnt want his commits to be in that pull?
12:16 < belcher> yes     
12:16 < delinquentme_> oh =p
12:16 < delinquentme_> hmmmmm
12:17 < waxwing> delinquentme_, usually one just squashes one's own commits (as desired), do a git push -f to your branch, and your commits are updated in the PR, it shouldn't affect previous ones (that are unchanged)
12:17 < delinquentme_> You're versed in running merge conflict fixes right?
12:17 < waxwing> i wonder if the ~10 somehow screwed it up. you changed the lines to squash for only your ones right.
12:17 < belcher> yes, but there shouldnt be any merge conflicts, they only appeared because of this rebase
12:17 < belcher> yes waxwing 
12:17 < delinquentme_> Ohhh so wait. 
12:18 < belcher> but your commits which were in the file to be edited are the ones that are now included
12:19 < delinquentme_> So commits e9c5338-dfe9e2a  were already in joinmarket-clientserver ... and you guys were happy with them?
12:19 < belcher> yep, they were merged in so yes
12:19 < delinquentme_> For a second I thought you were trying to say that you accidentally worked atop a few commits that you didn't want in the pull.
12:19 < delinquentme_> thats not the case?
12:20 -!- headcase [~headcase@unaffiliated/headcase] has quit [Remote host closed the connection]     
12:20 < belcher> nope, that is not the case
12:20 < belcher> its because i did HEAD~10 instead of HEAD~4 or whatever the right number would have been
12:20 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
12:21 < delinquentme_> ehh that shouldnt have caused an issue.
12:21 < delinquentme_> Im looking at the commits for master and it looks like the last commit on master is 2215318
12:21 < belcher> oh hold on
12:22 < belcher> no.. commits were added to master in the meantime
12:22 < waxwing> i suspect the combination of force push with those extra commits is what does it. but i'm not sure how you squash without doing that.
12:22 < waxwing> creates new commit hashes, i'm thinking.
12:22 < belcher> so my local branch wasnt working off them, i shouldve done git pull first
12:22 < waxwing> well, not necessarily. you should be able to update your PR without worrying about later commits in master.
12:22 < delinquentme_> well youll need to force push if you're overwriting commits history on github.
12:23 < waxwing> delinquentme_, i'm talking specifically about squashing commits in a PR.
12:23 < delinquentme_> which is what youll do if you've already pushed and then you local rebase... and then want to push that updated part to the corresponding repo on git.
12:23 < delinquentme_> waxwing,  right.  
12:23 < delinquentme_> belcher did you do a $ git mergebase  and get the common ancestor? 
12:24 < belcher> i did not
12:24 < waxwing> i don't think he should be worrying about merges here or merge conflicts, that can be dealt with after. here the task is just to squash the commits in the PR.
12:26 -!- headcase [~headcase@unaffiliated/headcase] has quit [Ping timeout: 240 seconds]     
12:26 < waxwing> you can just do a 'git rebase master' of course, i've started doing that in some contexts, but, here there wasn't an attempt to do that, just to squash.
12:26 < delinquentme_> belcher whats the current sha of what you're working on?
12:26 < belcher> so i do that right now?
12:26 < belcher> delinquentme_ git log shows 86ff9f6e7ff4861011a91fcfaefa5c4791e4adb0
12:26 < delinquentme_> well one sec here
12:27 < delinquentme_> so we need to determine if the common ancestor for your branch and master
12:27 < waxwing> the common ancestor will be the 11th back, since it's re-created the other pre-PR commits with a new commit hash. i believe.
12:28 < delinquentme_> git merge-base master 86ff9f6e7ff4861011a91fcfaefa5c4791e4adb0
12:28 < delinquentme_> run that
12:29 < delinquentme_> it should be yeah what waxwing  said.
12:29 < belcher> done
12:29 < delinquentme_> what sha did it cough back?
12:29 < belcher> 86ff9f6e7ff4861011a91fcfaefa5c4791e4adb0
12:30 < delinquentme_> oh duh bc you've already merged =p
12:30 < delinquentme_> yeah thats the most recent one 
12:30 < delinquentme_> Yeah I think you've just got a few commits that arent already on master, which you've got under your rebased one.
12:31 < delinquentme_> ohhhh
12:31 < delinquentme_> 67529015cf740a816bc9a8192e239cfa5322be2f
12:32 < delinquentme_> is now e9c53389df8360511ff9b0858d021e4dcb1f5d2d
12:32 < delinquentme_> yeah
12:32 < delinquentme_> hmmm
12:33 < delinquentme_> so yeah... did you pull the most recent version of master onto your local master?
12:33 < belcher> i did not
12:33 < delinquentme_> Im guessing thats the problem.  
12:34 < delinquentme_> Im trying to recall the protocol we used =X
12:34 < delinquentme_> lemme see if I can dig it up...
12:34 < belcher> `git pull` first i bet :p
12:34 < waxwing> if it was me i'd make a new branch, go back to b8a5ee1d5c2b6170aa606100321140de37043bd1 and then apply your new squashed commit (with git cherry-pick)
12:34 < waxwing> i think that'd put you back where you want (new PR though)
12:34 < delinquentme_> YAAAAAS
12:34 < delinquentme_> https://gist.github.com/chrislerum/566697
12:34 < belcher> yep, new branch seems the easiest
12:34 < delinquentme_> here we go.
12:34 < belcher> unless delinquentme_ has something
12:35 < belcher> (sometimes it can be fun to play with tools after all)
12:35 < delinquentme_> ignore that gist for a sec... lemme refresh my mind on this
12:35 < delinquentme_> YEAH ok.
12:35 < delinquentme_> so when you're developing .. be developing locally on your own branch 
12:36 < delinquentme_> so be on damn_im_so_sexy branch
12:36 < delinquentme_> do coding , hacking etc etc.
12:36 < delinquentme_> when you want to merge into master ... commit your changes to damn_im_so_sexy
12:36 < delinquentme_> checkout master.
12:36 < delinquentme_> pull down master from github.
12:37 < delinquentme_> ensure no conflicts. ... there shouldnt be because you've not been devving atop master
12:37 < delinquentme_> switch to your damn_im_so_sexy branch
12:37 < waxwing> well yes rebasing would be good. in this case, since things are screwed up now, i think just make a new PR, and yeah you could just take it off current master now. you might have to merge, not sure if there are any conflicts in those last few commits.
12:37 < delinquentme_> $ git rebase master
12:38 < delinquentme_> ( this is the step that would have prevented this overwrite in history )
12:38 < delinquentme_> and then your working branch has synched history w master.  Fix any conflicts 
12:38 < delinquentme_> commit
12:38 < delinquentme_> switch to master ... $ git merge damn_im_so_sexy
12:38 < delinquentme_> and then thatll be a fast-forward.
12:38 < delinquentme_> then you can push that
12:39 < belcher> right so
12:39 < belcher> i do `git branch another_branch` ?
12:39 < waxwing> git checkout -b new-branch-name
12:39 < delinquentme_> and in the above you could do a rebase ... say after commiting damn_im_so_sexy and prior to pulling down master
12:39 < waxwing> if you're currently in master
12:39 < delinquentme_> yeahp
12:40 < delinquentme_> now what do you guys want to do about the conflict?
12:40 < delinquentme_> or the rewriting of history?
12:40 < delinquentme_> fuck i love adderall =X
12:40 < belcher> there is no conflict, the conflict only appears because of the rebase problems
12:40 < delinquentme_> yeah so you can try to just push that up and run tests and see what happens
12:41 < delinquentme_> I think git will do a ...
12:41 < delinquentme_> idk why I want to call it an octopus merge 
12:41 < delinquentme_> lol     
12:41 < belcher> ok so, can you tell me what commands to run to do your method
12:41 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
12:41 < delinquentme_> lemme look this up.. oh. It is an octopus.
12:41 < delinquentme_> for development?
12:42 < delinquentme_> You're on master so just $git checkout -b awesome_branch
12:42 < belcher> like, to solve this rebase mess thingy
12:42 < belcher> ok     
12:42 < belcher> done
12:42 < delinquentme_> oh wait you want me to tell you how to fix the rebase thinger.
12:42 < belcher> yeah
12:42 < belcher> i didnt 100% understand what you said earlier
12:42 < delinquentme_> totally ok.
12:42 < belcher> if you want to try it, tell me the commands and ill just run them
12:43 < delinquentme_> Ill make a gist for later
12:43 < delinquentme_> ok so $ git checkout master
12:43 < delinquentme_> master is where the rebase was run right?
12:43 < delinquentme_> yeah.
12:43 < belcher> yes     
12:43 < delinquentme_> ok you're back on master?
12:43 < belcher> yep     
12:43 < delinquentme_> give me the output of $ git log
12:43 < belcher> how far back do you want it?
12:44 < waxwing> travis manages the double whammy today: marks build as passed when the tests failed, and marks build as failed when the tests passed :)
12:44 < delinquentme_> like 20 commits
12:44 < delinquentme_> kekeke
12:45 < delinquentme_> I gotta get you guys to teach me aboot travis 
12:45 < delinquentme_> pastebin or if we wanna get crazy just here in the chat.
12:45 < belcher> here we go https://pastebin.com/pj0vpYsf
12:47 < delinquentme_> ok you're on master... give me a $ git checkout -b master-hold
12:47 < delinquentme_> well make another branch to record the work you did.
12:48 < delinquentme_> the $ git checkout master
12:48 < belcher> ok done
12:49 < belcher> switched to a new branch 'master hold'
12:50 < delinquentme_> does it have a space in it?
12:50 < delinquentme_> plz say no 
12:50 < belcher> no it doesnt
12:50 < delinquentme_> ok     
12:50 < belcher> the copypaste "Switched to a new branch 'master-hold'"
12:50 < delinquentme_> cool $ git checkout master
12:51 < belcher> done
12:51 < delinquentme_> now were back on your local master
12:51 < delinquentme_> git checkout 22153180cf7f77cb80e39d67a6fbceea173231c8
12:51 < belcher> fatal: reference is not a tree: 22153180cf7f77cb80e39d67a6fbceea173231c8
12:51 < delinquentme_> ohhh ok ok
12:51 < delinquentme_> 1 sec 
12:52 < delinquentme_> see if you can find how to compare a local branch and remote 
12:52 < delinquentme_> I need a git merge-base for master and master:remote
12:52 < delinquentme_> if thats how you specify a remote branch
12:52 < waxwing> belcher, that's probably because you haven't done a git pull on master to get the most recent
12:53 < belcher> i did a git pull about 10 minutes ago and it said all up to date
12:53 < waxwing> oh sorry my mistake 'git checkout 221..' doesn't make sense, that's a commit, not a branch
12:53 < delinquentme_> You were on master and you pulled remote master onto your local master?
12:54 < belcher> i did `git pull` yes
12:54 < waxwing> no what am i saying, that does make sense. oh, not sure what's going on then, leave you to it :)
12:54 < delinquentme_> and it didnt spit at you?
12:55 < belcher> Already up-to-date.
12:55 < belcher> thats what it said
12:55 < delinquentme_> O_o;;;;
12:55 < delinquentme_> ok well anyways lol
12:55 < delinquentme_> actually just do this:
12:55 < delinquentme_> $ git checkout 4cc6cdb3b6ba52bcd84e6ab00d64881652ad4d53
12:56 < delinquentme_> that should say something like...HEAD is now at 4cc6cdb... Merge #66: Allow manual fee/Kb setting
12:56 < belcher> yep     
12:56 < delinquentme_> ok cool
12:56 < belcher> its got a big bit of text, i can put in a pastebin
12:56 < belcher> basically explaining what just happened, and what i can do next
12:56 < delinquentme_> till say something about detatched state?
12:57 < delinquentme_> yeah.
12:57 < belcher> https://pastebin.com/YP7Y7YNE
12:57 < belcher> that^
12:57 < delinquentme_> perfect.
12:57 < delinquentme_> $ git reset --hard 4cc6cdb3b6ba52bcd84e6ab00d64881652ad4d53
12:57 < delinquentme_> wot now
12:57 < delinquentme_> no lol
12:57 < belcher> "HEAD is now at 4cc6cdb Merge #66: Allow manual fee/Kb setting"
12:57 < delinquentme_> git reset --hard 4cc6cdb3b6ba52bcd84e6ab00d64881652ad4d53
12:57 < belcher> too late
12:58 < delinquentme_> ok perf.
12:58 < belcher> thats the same thing?
12:58 < delinquentme_> lucky us.
12:58 < delinquentme_> yeah haha i was getting hasty pasty
12:58 < delinquentme_> yeah thats the commit we want.
12:58 < delinquentme_> $ git pull origin master
12:58 < delinquentme_> and give me the output from that.
12:59 < belcher> https://pastebin.com/aUrtAvRs
12:59 < delinquentme_> <3 Fast-forward <3
12:59 < delinquentme_> the best kinda merge
13:00  * delinquentme_ heavy breathing
13:00 < delinquentme_> ok cool
13:00 < delinquentme_> nao... 
13:02 < delinquentme_> now what we need to do is get the work you did on master-hold ontop of this 
13:02 < delinquentme_> do you know offhand how many files were changed in the commit that you rebased?
13:02 < delinquentme_> it looks like 3 maybe?
13:03 < belcher> you mean the files i edited in my PR ? that was 3
13:03 < belcher> wallet.py wallet_utils.py and joinmarket-qt.py
13:04 < delinquentme_> Ok so im thinking in the chat rn ... your work in that commit was built atop the other 5 commits.  Sooo chances are youll need the code there for the work on your PR to be useful
13:05 < delinquentme_> how covered are the tests? belcher?  Like if I had you do the shitty thing of just pasting your edits from those 3 files onto the top of master
13:05 < delinquentme_> and running tests...
13:05 < waxwing> belcher, i'm wondering about remotes. that pastebin shows fetching from chris-belcher/joinmarket-clientserver, not joinmarket-org/joinmarket-clientserver. what's your name for the latter remote? (git remote -v)
13:05 < delinquentme_> would you feel confident that things are covered?
13:05 < belcher> i didnt write any tests
13:05 < waxwing> tests don't cover enough to be of any use here
13:06 < delinquentme_> ok     
13:06 < delinquentme_> can you test manually the edits you made easily?
13:06 < belcher> waxwing origin	https://github.com/chris-belcher/joinmarket-clientserver.git (fetch)
13:06 < belcher> origin	https://github.com/chris-belcher/joinmarket-clientserver.git (push)
13:06 < belcher> yep     
13:06 < delinquentme_> if yes ... do that.  manually copy whats on master-hold in those 3 files ...
13:06 < delinquentme_> and put those edits into the current master
13:06 < delinquentme_> run your tests.
13:06 < delinquentme_> i need to take 5 really fast
13:07 < delinquentme_> brb     
13:07 < belcher> will `git diff` work for seeing all the edits?
13:07 < belcher> i suppose ill try it and see
13:07 < waxwing> right, so if you do git pull you're going to take your own fork by default (i call the main one 'jmorg' so i always do 'git pull jmorg master')
13:08 < belcher> ah     
13:10 < delinquentme_> yeah! thatll work
13:11 < delinquentme_> is it a long list?
13:11 < delinquentme_> git diff master master-hold
13:12 < belcher> git diff shows nothing
13:12 < belcher> because my files are unchanged
13:12 < belcher> i.e. the files already contain my work
13:13 < delinquentme_> you're on master
13:13 < delinquentme_> wat.
13:13 < delinquentme_> that doesnt make sense.
13:13 < delinquentme_> $ git diff master master-hold
13:14 < belcher> nothing
13:14 < delinquentme_> $git checkout master
13:14 < belcher> it didnt print anything
13:14 < belcher> Switched to branch 'master'
13:14 < belcher> Your branch is up-to-date with 'origin/master'.
13:14 < arubi> belcher, do you have any other remotes other than your own origin?
13:15 < delinquentme_> Ohhhh wait.
13:15 < delinquentme_> $ git checkout master
13:15 < delinquentme_> and $ git diff master-hold
13:15 < delinquentme_> thats what you want.
13:15 < belcher> arubi i dont know, what command should i run to check
13:15 < arubi> try `git config -l | grep "remote\|branch"`
13:15 < belcher> delinquentme_ still doesnt print anything
13:15 < delinquentme_> arubi, that isnt helping w the rebase issue?
13:15 < belcher> arubi remote.origin.url=https://github.com/chris-belcher/joinmarket-clientserver.git
13:15 < belcher> remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
13:15 < belcher> branch.master.remote=origin
13:15 < belcher> branch.master.merge=refs/heads/master
13:16 < delinquentme_> or is it?
13:16 < arubi> fetching and pulling from that repo is wrong I think?  should be joinmarket-clientserver at joinmarket-org
13:17 < arubi> belcher, are you using ssh with github?
13:17 < delinquentme_> arubi hes pushing to his repo
13:17 < delinquentme_> not joinmarket main.
13:17 < belcher> arubi how do you mean?
13:17 < delinquentme_> arubi, talk to me. What are you trying to accomplish?
13:17 < arubi> yea but you want to fetch from that master right..?
13:17 < delinquentme_> arubi
13:17 < delinquentme_> ive got this :D
13:17 < delinquentme_> shhhh
13:17 < arubi> okay
13:17 < delinquentme_> I apprecite the help but this is a complex thinger
13:17 < delinquentme_> okay 
13:17 < delinquentme_> $ git checkout master 
13:17 < delinquentme_> $ git log
13:18 < delinquentme_> whats  the commit at the top?
13:18 < belcher> it is
13:18 < delinquentme_> the sha and the commit note
13:18 < belcher> commit 86ff9f6e7ff4861011a91fcfaefa5c4791e4adb0
13:18 < belcher> Author: chris-belcher <chris-belcher@users.noreply.github.com>
13:18 < belcher> Date:   Mon Sep 18 21:05:19 2017 +0100
13:18 < belcher>     added optional feature to use mnemonic passphrases to create
13:18 < belcher>     two factor recovery phrases
13:19 < delinquentme_> you're on ... master ... not master-hold right?
13:20 < delinquentme_> $ git checkout master
13:20 < delinquentme_> lol     
13:20 < delinquentme_> Oh wait arubi is right.
13:20 < belcher> i was on master, it says Already on 'master'
13:20 < delinquentme_> arubi, my apologies.
13:21 < delinquentme_> ok cool
13:21 < arubi> :P     
13:21 < delinquentme_> $ git reset --hard 4cc6cdb3b6ba52bcd84e6ab00d64881652ad4d53
13:21 < delinquentme_> so yeah you've already pushed this up to your master 
13:21 < belcher> HEAD is now at 4cc6cdb Merge #66: Allow manual fee/Kb setting
13:21 < delinquentme_> so we need you to get the master from joinmarket-org
13:21 < delinquentme_> arubi, you totally deserve to kick me.
13:22 < delinquentme_> ok so lem think here.
13:22 < arubi> no it's fine :)
13:22 < delinquentme_> arubi what do you think on how we get his master to the joinmarket-org master?
13:22 < waxwing> git remote add <-- to add a new remote :)
13:22 < arubi> yep!
13:23 < delinquentme_> and then you guys are thinking add the new remote ... and pull from that master.
13:23 < delinquentme_> cool I've not done this before
13:23 < delinquentme_> <3     
13:23 < arubi> it's why I asked if belcher is using ssh or not, to know what to set the remote's url to
13:24 < arubi> so it'll be https://.. or git@github... depends
13:24 < delinquentme_> yeah you were way ahead of me :P
13:24 < belcher> what do it mean to use ssh? im doing this on my own laptop if thats what you mean
13:24 < belcher> oh, im using http
13:24 < delinquentme_> how you're pulling the repos
13:24 < belcher> at the start i made it with `git clone http://something`
13:24 < belcher> https*
13:25 < arubi> alright so first `git remote add -f -t master jmorg https://github.com/JoinMarket-Org/joinmarket-clientserver.git`
13:25 < arubi> that should add a remote at jmorg called 'jmorg' that tracks that master
13:26 < delinquentme_> git remote add origin https://github.com/JoinMarket-Org/joinmarket-clientserver.git
13:26 < arubi> no no not origin
13:26 < belcher> should i run arubi's or delinquentme_'s command?
13:26 < delinquentme_> right. do what arubi 
13:26 < belcher> ok running arubi's
13:26 < delinquentme_> arubi seems more gosu than I yam
13:26 < belcher> done
13:26 < delinquentme_> git remote -v
13:26 < arubi> alright, not do `git branch upstream`
13:27 < belcher> now do?
13:27 < belcher> done
13:27 < arubi> err, yea.  now do
13:27 < arubi> right, now `git checkout upstream``
13:27 < arubi> and `git reset --hard jmorg/master`
13:27 < arubi> err, before that
13:28 < belcher> so first `git checkout` then `git reset`
13:28 < belcher> just checking
13:28 < arubi> no sorry, I got confused about the ordering.  after `git branch`, run `git branch upstream --set-upstream-to=jmorg/master`
13:28 < arubi> after that you can continue with running `checkout` and `reset --hard` on that upstream branch
13:28 < belcher> done, "Branch upstream set up to track remote branch master from jmorg."
13:29 < belcher> running `git checkout upstream`
13:29 < belcher> Switched to branch 'upstream'
13:29 < belcher> Your branch is behind 'jmorg/master' by 37 commits, and can be fast-forwarded.
13:29 < belcher>   (use "git pull" to update your local branch)
13:29 < delinquentme_> arubi,  what does $ git checkout upstream do?
13:29 < belcher> git reset --hard jmorg/master
13:29 < belcher> HEAD is now at 2215318 fix indentations in ROI calculation
13:29 < arubi> that should be head at jmorg's master
13:29 < delinquentme_> bingo.
13:29 < delinquentme_> arubi, hell yuess
13:30 < delinquentme_> now you can do $ git diff master-hold
13:30 < arubi> nice, so upstream is the branch you always branch from from now on when you want to work on something
13:30 < arubi> and you set the remote of the branched upstream to your own origin, so you can test and whatever
13:30 < arubi> then when you're ready, you PR or push to jmorg's from there.  but 
13:31 < delinquentme_> arubi what is upstream?
13:31 < arubi> but.. ->  yea, now you can continue with diffs :)
13:31 < arubi> upstream == jmorg/master
13:31 < delinquentme_> That is a reserved keyword right?
13:31 < arubi> I don't think?
13:31 < delinquentme_> so that could jsut be any keyword...
13:31 < delinquentme_> erm "any word"
13:31 < delinquentme_> yeah im trying to understand what you did here =]
13:31 < arubi> I use that myself so that's why I suggested it :)
13:32 < delinquentme_> ok so hes on a branch called "upstream" right now?
13:32 < belcher> i am
13:32 < arubi> yea.  diffing to either 'origin/master' or 'master-hold' should be the same diff
13:33 < delinquentme_> right.
13:34 < arubi> so now it all depends what `git diff upstream master-hold` says and if it makes sense to just merge the two or if it requires work
13:35 < belcher> there are a fair amount of different lines
13:35 < belcher> including my own work, but others too
13:36 < delinquentme_> Ok so basically what you just had us do here arubi ... is make a new remote ... accessible through the var jmorg  ... you had us reset --hard to jmorg/master ... so that took his local master which WAS the base for upstream ... and instead set it to jmorg/master
13:36 < delinquentme_> cool. Yeap . I understand <3 thank you arubi 
13:36 < arubi> his local master still points to chris-belcher/master
13:36 < belcher> i am also learning things :)
13:36 < arubi> (it should be)
13:36 < delinquentme_> arubi, and are we doing this the best way possible?  You're up-to-date on the state of the rebase ?
13:37 < arubi> I'm not up to date on that but I'm starting to see what you were talking about before :)
13:37 < delinquentme_> yeah so far I've basically retained his work in master-hold 
13:37 < arubi> so first maybe best to create a new local branch off of upstream
13:38 < delinquentme_> and since his rebase was atop a different history than master ... He needs that history for his stuff to be working
13:38 < delinquentme_> agreed.
13:38 < delinquentme_> I mean we *could* do the crazy thing
13:38 < delinquentme_> (which is why git is so fun)
13:38 < delinquentme_> and just make a branch off of upstream
13:39 < delinquentme_> and just $git merge master-hold
13:39 < delinquentme_> and see what kinda merge it runs :D?
13:39 < delinquentme_> and if that goes to shit we can do the more complex thing 
13:39 < arubi> hmm but I do want to get to a point first where the only diff is belcher's work
13:40 < arubi> but I'm not sure, belcher did you work on old files then?
13:40 < belcher> i made edits to wallet.py wallet_utils.py and joinmarket-qt.py
13:40 < belcher> if its too much of a problem i can just make a new branch and new PR
13:41 < arubi> oh I bet when you ran diff it showed a bunch of unrelated stuff
13:41 < arubi> you can run `git diff upstream:path/to/file.py master:path/to/file.py` to see only these files
13:41 < belcher> yep     
13:41 < belcher> right
13:42 < arubi> so I'm wondering if in these files, there are more diffs than just your own work
13:43 < belcher> checking now
13:43 < belcher> yes there are
13:43 < belcher> theres other edits i didnt make
13:44 < arubi> to be sure, `git diff master master-hold` , does return nothing right?
13:45 < belcher> no, it returns a lot
13:45 < belcher> many many edits
13:47 < arubi> `git log master` , `git log master-hold` , which one is where you stopped working?
13:47 < arubi> ohh right, you reset master and pulled from your own origin right
13:47 < belcher> master-hold is where my commit is
13:48 < arubi> `git diff upstream:path/to/file.py master-hold:path/to/file.py`  instead, phew this is confusing
13:49 < belcher> my edits are there, but there are also some other edits
13:49 < belcher> e.g. -                    vbyte=get_p2pk_vbyte())
13:49 < belcher> +                    vbyte=111)
13:50 < arubi> okay, you're still on the upstream branch?
13:50 < belcher> yes     
13:52 < delinquentme_> I still say you just $ git checkout upstream $ git checkout -b upstream-trasher $ git merge master-hold
13:52 < delinquentme_> and just paste the output of what happens
13:52 < delinquentme_> its a quick and easy thing to run + could possibly be a really simple solution 
13:52 < delinquentme_> and bc  $ git checkout -b upstream-trasher
13:52 < delinquentme_> youve isolated any damage
13:52 < arubi> I was thinking `pull --force --rebase` , but yea you could try that
13:53 < delinquentme_> arubi ... when you're on master-hold ?
13:53 < delinquentme_> I no comprendo :D  
13:54 < arubi> on a copy of master-hold
13:54 < arubi> try what you said first, I think it's easier
13:54 < delinquentme_> but that would only pull fro his master
13:54 < delinquentme_> belcher you there? Are you currently moving around code?
13:54 < belcher> im not doing anything
13:54 < delinquentme_> you should stash it =]
13:54 < delinquentme_> oh ok cool
13:54 < belcher> i have backups :)
13:55 < delinquentme_> $ git status shows no edited files right?
13:55 < belcher> yep     
13:55 < delinquentme_> arubi, could you talk more about what you were thinking with the pull --force --rebase?
13:55 < delinquentme_> ok belcher do this:
13:55 < arubi> delinquentme_, `git pull --force --rebase  jmorg master` is what I meant as the full command
13:55 < delinquentme_> $ git checkout upstream $ git checkout -b upstream-thrasher 
13:56 < delinquentme_> $ git merge master-hold
13:56 < delinquentme_> and paste the output to us
13:56 < belcher> https://pastebin.com/shtaujSY
13:56 < delinquentme_> arubi, ok cool so you'd essentially be rebasing master-hold from the canonical master ... cool yeah. I like
13:56 < belcher> merge conflict
13:56 -!- headcase [~headcase@unaffiliated/headcase] has quit [Remote host closed the connection]     
13:56 < delinquentme_> oh. thats not bad at all
13:56 < delinquentme_> well
13:57 < delinquentme_> i havnt seen the files but
13:57 < delinquentme_> take a look at them
13:57 < belcher> so ill fix the conflicts in electruminterface and electrumdata ?
13:57 < belcher> something waxwing or adlai did in the meantime?
13:57 < delinquentme_> yeah paste the entire contents if you can to us
13:57 < delinquentme_> i just want to make sure that the conflicts arent like multi-layered
13:57 < delinquentme_> ( i've seen hell in rebase conflicts )
13:59 < belcher> electrum data https://pastebin.com/mvqedyU3 electruminterface https://pastebin.com/aB7nSgNy
13:59 < belcher> seems easy to fix but i didnt make those edits so id have to look
14:00 < belcher> tbh it seems easier to start from scratch and make a new PR
14:00 < arubi> fyi, what I said ^ produces a diff of only the 3 files belcher edited against upstream
14:01 < delinquentme_> arubi, a diff? You mean only the 3 files had conflicts?
14:02 < belcher> ok, so i could abandon the merge with reset --hard ?
14:02 < delinquentme_> sorry im being pedantic ... bc im learning
14:02 < delinquentme_> belcher no
14:02 < delinquentme_> either case you're going to need to do conflict resolutions... right arubi ?
14:02 < delinquentme_> I think the history in arubi's case would be cleaner 
14:03 < delinquentme_> but I think the resulting codebase will be the same ...
14:03 < arubi> doing the pull --force ... on top of 86ff9f6e7ff4861011a91fcfaefa5c4791e4adb0 produces a diff of the 3 wallet.py files
14:03 < delinquentme_> arubi, I thought doing a pull will run the merge and create conflict files no?
14:03 < delinquentme_> or does that output a diff now?
14:04 < arubi> $ git pull --force --rebase  jmorg master
14:04 < arubi> From github.com:JoinMarket-Org/joinmarket-clientserver
14:04 < arubi>  * branch            master     -> FETCH_HEAD
14:04 < arubi> First, rewinding head to replay your work on top of it...
14:04 < arubi> Applying: added optional feature to use mnemonic passphrases to create
14:04 < arubi> done on top of :
14:04 < arubi> $ git log --oneline -1
14:04 < arubi> 86ff9f6 added optional feature to use mnemonic passphrases to create two factor recovery phrases
14:05 < arubi> not sure if that's what master-hold has, this is chris-belcher/master
14:07 < arubi> then I have : 
14:07 < arubi> $ git diff upstream | grep -- "---\|+++"
14:07 < arubi> --- a/jmclient/jmclient/wallet.py
14:07 < arubi> +++ b/jmclient/jmclient/wallet.py
14:07 < arubi> --- a/jmclient/jmclient/wallet_utils.py
14:07 < arubi> +++ b/jmclient/jmclient/wallet_utils.py
14:07 < arubi> --- a/scripts/joinmarket-qt.py
14:07 < arubi> +++ b/scripts/joinmarket-qt.py
14:08 < belcher> ok so lets do that?
14:09 < arubi> yep, `git checkout master-hold` , `git checkout -b master-hold_mrg` `git pull --force --rebase  jmorg master`
14:10 < belcher> cant do the checkout because its in the middle of a merge
14:10 < arubi> ah then `git reset --hard`
14:10 < delinquentme_> well do a reset in there to clear working .. tree ? is it called?
14:10 < delinquentme_> yeah.
14:10 < belcher> ok     
14:11 < delinquentme_> arubi, is "working tree" the right term for "the stuff you're currently working on" ... all the stuff that shows up in $ git status
14:11 < belcher> ok done arubi 
14:11 < arubi> not sure delinquentme_, I'm still learning myself :)  trying things locally here too
14:11 < belcher> git diff doesnt print anything
14:11 < arubi> `git diff upstream`
14:12 < arubi> should be showing your changes to wallet.py, wallet_utils.py and joinmarket-qt.py
14:12 < arubi> (and no more)
14:12 < belcher> oh excellent
14:12 < belcher> yes it does
14:13 < arubi> cool, so now you just push a new branch and PR :)  hopefully it didn't mess some history we don't see..
14:13 < arubi> but I doubt it..
14:13 < belcher> so `git push origin master-hold_mrg` and then open a new PR on the github website?
14:14 < arubi> I think you need to add '-u' after 'push', and yes it'll show a new branch alert and give you the option of PRing
14:14 < delinquentme_> wait... so the git diff shows *only* the changes to  wallet.py, wallet_utils.py and joinmarket-qt.py ??!? and no more?
14:14 < arubi> need the '-u' to create a new branch on github with the same name
14:15 < arubi> yea, because we pulled and rebased from upstream
14:15 < delinquentme_> Oh wait I guess the forced rebase will handle all of the commits which were re-insterted
14:15 < delinquentme_> belcher could you paste me the output that git gave you after running $ git pull --force --rebase?
14:16 < delinquentme_> im REALLY curious what happened there.
14:16 < belcher> one sec
14:16 < arubi> https://pastebin.com/5cubqecr
14:16 < arubi> that's what I see at least
14:17 < GitHub137> [joinmarket-clientserver] chris-belcher opened pull request #88: added optional feature to use mnemonic passphrases to create two factor recovery phrases (master...master-hold_mrg) https://git.io/vdvct
14:17 < belcher> ok this looks fine!
14:17 < belcher> thanks arubi and delinquentme_ 
14:17 < belcher> learned more about git too
14:17 < arubi> sweet, yw
14:17 < belcher> delinquentme_ if arubi's pastebin isnt enough, tell me what to run and ill put it on pastebin
14:17 < delinquentme_> arubi,  thats the diff ... what happend on the pull ?
14:17 < arubi> "First, rewinding head to replay your work on top of it..." ^^  I pasted that above
14:17 < delinquentme_> yeah belcher Im looking for the output from $ git pull --force --rebase
14:18 < arubi> the command and outputs
14:18 < delinquentme_> that was it?!
14:18 < belcher> Current branch master-hold_mrg is up to date.
14:18 < delinquentme_> it was only a few lines of output?!
14:18 < arubi> delinquentme_, you can actually just set that up locally
14:18 < arubi> yea that's what it was
14:18 < delinquentme_> fuck me.
14:18 < delinquentme_> arubi, thats brilliant.
14:18 < arubi> :)     
14:19 < delinquentme_> haha yeah dude. Im thrilled.
14:19 < delinquentme_> so here guys have a look at this:
14:19 < delinquentme_> https://gist.github.com/carlcrott/79cf989612515279bbbffc2339d2ea66
14:19 < delinquentme_> lmk if that as a workflow sound reasonable
14:19 < delinquentme_> belcher ^ if you do something like the above it will keep you free from running resolutions like this =]
14:20 < belcher> cool ty
14:20 < belcher> i did know i just forgot to git pull this time :\
14:20 < delinquentme_> props to you having the patience to do this man.  This isnt light git work =]
14:20 < belcher> though normally when that happens i rm -rf * and start again from backups
14:20 < delinquentme_> oh cool
14:20 < belcher> so the way it was fixed was..
14:20 < belcher> wait
14:20 < arubi> belcher, you'd actually need to have pulled from jmorg which you didn't have set up
14:21 < delinquentme_> yeah I think the biggest thing is developing on a branch thats not master and keeping master up to date w the global repo
14:21 < belcher> we pulled from jmorg and merged that master and my master together?
14:21 < arubi> so now that you have upstream, you can always pull on that and bbranch
14:21 < delinquentme_> we pulled jmorg... and rebased your master-hold off of that
14:21 < arubi> right
14:21 < belcher> ok     
14:21 < belcher> and then the only difference was the code i did
14:21 < belcher> alright
14:22 < delinquentme_> so it took the latest stuff you had on master-hold ... and just fixed the history to be in alignment with the jmorg
14:22 < delinquentme_> belcher were there conflicts to be fixed ?
14:23 < delinquentme_> it sounds like no...
14:23 < belcher> no conflicts
14:23 < delinquentme_> damn.
14:23 < delinquentme_> im so impressed rn
14:24 < delinquentme_> that was some serious hotness
14:24 < belcher> lol yes
14:28 < GitHub137> [joinmarket-clientserver] chris-belcher closed pull request #84: Optional feature to use mnemonic passphrases to create two factor recovery phrases (master...master) https://git.io/v5NYx
14:28 < belcher> (thats the other one)
14:46 -!- trotski2000 [sid206086@gateway/web/irccloud.com/x-sbdvzrsnnukgcezr] has quit [Ping timeout: 252 seconds]     
14:47 -!- technonerd [~techno@unaffiliated/technonerd] has quit [Ping timeout: 252 seconds]     
14:47 -!- Lightsword [~Lightswor@2604:a880:1:20::1d3:9001] has quit [Ping timeout: 252 seconds]     
14:48 -!- trotski2000 [sid206086@gateway/web/irccloud.com/x-cslgoczemhnytsvs] has joined #joinmarket     
14:49 -!- delinquentme_ [~delinquen@173-132-48-142.pools.spcsdns.net] has quit [Ping timeout: 260 seconds]     
14:51 -!- delinquentme_ [~delinquen@173-132-48-142.pools.spcsdns.net] has joined #joinmarket     
14:53 < delinquentme_> waxwing, you around?
14:54 -!- Lightsword [~Lightswor@2604:a880:1:20::1d3:9001] has joined #joinmarket     
14:59 < delinquentme_> belcher is your venv for joinmarket or jm-cs inside the directory itself?
15:02 -!- technonerd [~techno@unaffiliated/technonerd] has joined #joinmarket     
15:08 < arubi> you can put it there delinquentme_ .  that's where the install script creates it (./jmvenv)
15:11 < belcher> yes delinquentme_ 
15:12 < delinquentme_> Im re-writing that part of the testing wiki. I think waxwing determined that it being in there causes issues with tests running...
15:12 < delinquentme_> actually.
15:12 < delinquentme_> let me try.
15:12 < delinquentme_> you guys run tests with it in that directory right? Or are all of you using travis for test running?
15:14 < arubi> I have ./jmvenv and using ./test/run_tests.sh to run tests locally
15:14 < arubi> but I've seen more stability on travis, and even more stability on travis+docker
15:16 < arubi> I'm not sure about the difference between run_tests.sh and running the pytest command by itself.  you'd at least need to edit the .sh to add more tests 
15:16 < belcher> i havent set up tests for jm-cs yet
15:18 < delinquentme_> arubi, so you're not running them with: 
15:18 < delinquentme_> $ PYTHONPATH=.:$PYTHONPATH py.test --cov-report html --nirc=2 --ignore test/test_tumbler.py --btcroot=/path/to/bitcoin/bin/  --btcpwd=123456abcdef --btcconf=/Users/username/.bitcoin/bitcoin.conf
15:19 < delinquentme_> python -m pytest --cov-report html --nirc=2 --ignore test/test_tumbler.py --btcroot=/Users/carlcrott/python_projects/bitcoin/src/ --btcpwd=123456abcdef --btcconf=/Users/carlcrott/.bitcoin/bitcoin.conf
15:19 < arubi> nope, just `./test/run_tests.sh`
15:20 < delinquentme_> arubi, this is on joinmarket-clientserver ya?
15:20 < arubi> right
15:20 < arubi> you have a 'test' directory right?
15:20 < delinquentme_> got it. Yeah these are for joinmarket vanilla
15:20 < arubi> oh I see
15:21 < delinquentme_> i just want to get it sensible + running there so Ill keep the old commands in there
15:22 < arubi> well you'll need to set up some stuff for the tests like copying .cfg \ .conf files around and sourcing the virtualenv
15:22 < arubi> oh and get miniircd from joinmarket-org into ./miniircd
15:23 < arubi> then you can run the python tests
15:30 < delinquentme_> yeap
15:42 -!- Giszmo [~leo@reverso.156.228.153.190.static.operaciones.gtdinternet.com] has quit [Ping timeout: 240 seconds]     
15:48 -!- delinquentme_ [~delinquen@173-132-48-142.pools.spcsdns.net] has quit [Ping timeout: 240 seconds]     
15:53 -!- delinquentme_ [~delinquen@173-132-48-142.pools.spcsdns.net] has joined #joinmarket     
15:54 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
15:58 -!- headcase [~headcase@unaffiliated/headcase] has quit [Ping timeout: 240 seconds]     
16:03 -!- Giszmo [~leo@reverso.156.228.153.190.static.operaciones.gtdinternet.com] has joined #joinmarket     
16:16 -!- delinquentme_ [~delinquen@173-132-48-142.pools.spcsdns.net] has quit [Ping timeout: 252 seconds]     
16:39 -!- headcase [~headcase@unaffiliated/headcase] has joined #joinmarket     
16:46 -!- headcase [~headcase@unaffiliated/headcase] has quit []     
16:47 -!- delinquentme_ [~delinquen@108-235-112-153.lightspeed.sntcca.sbcglobal.net] has joined #joinmarket     
17:51 -!- Giszmo [~leo@reverso.156.228.153.190.static.operaciones.gtdinternet.com] has quit [Ping timeout: 260 seconds]     
18:07 -!- Giszmo [~leo@reverso.156.228.153.190.static.operaciones.gtdinternet.com] has joined #joinmarket     
18:16 -!- Giszmo [~leo@reverso.156.228.153.190.static.operaciones.gtdinternet.com] has quit [Ping timeout: 240 seconds]     
18:51 < delinquentme_> yeeee! pretty pleased w this: https://i.imgur.com/xraERML.png
18:51 < delinquentme_> just made myself a nice lil dashboard for whats going on w my blockchain
18:54 -!- malcomX703 [~sunwti@213.87.155.155] has joined #joinmarket     
18:54 -!- malcomX703 [~sunwti@213.87.155.155] has quit [Excess Flood]     
18:59 -!- Giszmo [~leo@pc-204-28-214-201.cm.vtr.net] has joined #joinmarket     
19:35 < GithubBot5678> [joinmarket] carlcrott closed pull request #760: Update requirements-dev.txt (master...patch-1) https://git.io/v5NMW
21:54 -!- arubi [~ese168@gateway/tor-sasl/ese168] has quit [Read error: Connection reset by peer]     
21:58 -!- arubi [~ese168@gateway/tor-sasl/ese168] has joined #joinmarket     
22:44 < midnightmagic> that's a lot of bitcoind.
22:47 < arubi> F5     
23:27 < delinquentme_> yeah wait. Am i actually running 5 instances of it ??
23:28 < GitHub117> [joinmarket-clientserver] AdamISZ closed pull request #87: return pytest return value in run_tests.sh (master...return_pytest) https://git.io/vderQ
23:28 < GitHub23> [joinmarket-clientserver] AdamISZ pushed 2 new commits to master: https://git.io/vdvFs
23:28 < GitHub23> joinmarket-clientserver/master f2cc367 fivepiece: return pytest return value in run_tests.sh
23:28 < GitHub23> joinmarket-clientserver/master ee4b389 AdamISZ: Merge #87: return pytest return value in run_tests.sh...
23:28 < delinquentme_> and whats F5 arubi ?
23:36 < arubi> delinquentme_, oh just Tree mode on tmux :)
23:36 < arubi> err, htop