mirror of
https://github.com/bitcoin-s/bitcoin-s.git
synced 2025-02-25 07:17:32 +01:00
Fixing merge conflicts
This commit is contained in:
commit
2918fc4eab
1 changed files with 0 additions and 1 deletions
|
@ -374,7 +374,6 @@ class TransactionSignatureSerializerTest extends FlatSpec with MustMatchers {
|
||||||
TransactionSignatureSerializer.serializeForSignature(spendingTx,inputIndex,scriptPubKey,SIGHASH_ALL(0x01)
|
TransactionSignatureSerializer.serializeForSignature(spendingTx,inputIndex,scriptPubKey,SIGHASH_ALL(0x01)
|
||||||
))
|
))
|
||||||
|
|
||||||
println("Serialized tx: " + serializedTxForSig)
|
|
||||||
//serialization is from bitcoin core
|
//serialization is from bitcoin core
|
||||||
serializedTxForSig must be ("01000000020001000000000000000000000000000000000000000000000000000000000000000000002321035e7f0d4d0841bcd56c39337ed086b1a633ee770c1ffdd94ac552a95ac2ce0efcac0100000000020000000000000000000000000000000000000000000000000000000000000000000000ffffffff01010000000000000001510000000001000000")
|
serializedTxForSig must be ("01000000020001000000000000000000000000000000000000000000000000000000000000000000002321035e7f0d4d0841bcd56c39337ed086b1a633ee770c1ffdd94ac552a95ac2ce0efcac0100000000020000000000000000000000000000000000000000000000000000000000000000000000ffffffff01010000000000000001510000000001000000")
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue