Skip to content
Permalink
Branch: master
Commits on Oct 9, 2019
  1. Merge #738: feature_fedpeg.py: just use testmempoolaccept checking bl…

    stevenroose committed Oct 9, 2019
    …inded peg-in…
    
    3e912de Sprinkle a bunch of syncs to avoid peg-in failure hanging (Gregory Sanders)
    3ac8e29 feature_fedpeg.py: just use testmempoolaccept checking blinded peg-in transactions (Gregory Sanders)
    
    Pull request description:
    
      … transactions
    
      Previous test had race condition causing spurious failures for no additional coverage.
    
      Resolves #728
    
    Tree-SHA512: f128bb0b8ad54da683c66bbd6ad1385927659fab4cc8e77e57943dea6c7d989389c39e29ff8d282bdab3e068ec38af449e2941e03f802fe477d839b636587e92
  2. Merge #730: Change Proprietary types to use the method specified in B…

    stevenroose committed Oct 9, 2019
    …IP 174
    
    34e1350 Use Elements PSBT magic when in Elements mode (Andrew Chow)
    3fa355c Change Proprietary types to use the method specified in BIP 174 (Andrew Chow)
    
    Pull request description:
    
      bitcoin/bips#849 (not yet merged) adds to BIP 174 proprietary types. This PR changes the PSBT types used in Elements to be in line with the proposed changes to the BIP/
    
    Tree-SHA512: 73085a16005448d9f6ad1b74da4a40043ec29738256a439f35106793d11d0e95cb8d728db5cfefe1ddd49cd80367f7f5790d09efaa95bc443e1d6ba295240c4d
Commits on Oct 8, 2019
  1. Merge #734: Don't run unit tests for compatibility run(which is a NOP)

    stevenroose committed Oct 8, 2019
    b53ad31 Disable functional tests for sanitzer runs which just OOM (Gregory Sanders)
    1893ba1 Don't run unit tests for compatibility run(which is a NOP) (Gregory Sanders)
    
    Pull request description:
    
      This particular build is intended for bitcoin_functional tests only, and the unit tests are timing out consistently for some unrelated reason, so turn them off.
    
    Tree-SHA512: 8f31b5f4fef38271652a3c534c2191d6b6d567e992ef27ba4a6f2fc8c3aebd6d9aef755563780554609346ab397adc71e16229878cad48289918d1ff71cfa0fb
You can’t perform that action at this time.