highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-11-12 07:08:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source 
* Bugfixes
* Removed whether to include sigs in txin for readElement/writeElement
This commit is contained in:
Joseph Poon
2015-12-30 23:34:40 -08:00
committed by Olaoluwa Osuntokun
parent 1772108544
commit 2d3253b95d
6 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lnwire/funding_request.go
View File

@@ -64,7 +64,7 @@ func (c *FundingRequest) Decode(r io.Reader, pver uint32) error {
//Inputs: Create the TxIns
// First byte is number of inputs
// For each input, it's 32bytes txin & 4bytes index
err := readElements(r, false,
err := readElements(r,
&c.ChannelType,
&c.RequesterFundingAmount,
&c.MinTotalFundingAmount,
@@ -106,7 +106,7 @@ func (c *FundingRequest) Encode(w io.Writer, pver uint32) error {
//DeliveryPkScript
//ChangePkScript
//Inputs: Append the actual Txins
err := writeElements(w, false,
err := writeElements(w,
c.ChannelType,
c.RequesterFundingAmount,
c.MinTotalFundingAmount,
@@ -204,6 +204,12 @@ func (c *FundingRequest) String() string {
inputs += fmt.Sprintf("\tIndex\t%d\n", in.PreviousOutPoint.Index)
}
}
var serializedPubkey []byte
if &c.Pubkey != nil && c.Pubkey.X != nil {
serializedPubkey = c.Pubkey.SerializeCompressed()
}
return fmt.Sprintf("\n--- Begin FundingRequest ---\n") +
fmt.Sprintf("ChannelType:\t\t\t%x\n", c.ChannelType) +
fmt.Sprintf("RequesterFundingAmount:\t\t%s\n", c.RequesterFundingAmount.String()) +
@@ -215,7 +221,7 @@ func (c *FundingRequest) String() string {
fmt.Sprintf("LockTime\t\t\t%d\n", c.LockTime) +
fmt.Sprintf("FeePayer\t\t\t%x\n", c.FeePayer) +
fmt.Sprintf("RevocationHash\t\t\t%x\n", c.RevocationHash) +
fmt.Sprintf("Pubkey\t\t\t\t%x\n", c.Pubkey.SerializeCompressed()) +
fmt.Sprintf("Pubkey\t\t\t\t%x\n", serializedPubkey) +
fmt.Sprintf("DeliveryPkScript\t\t%x\n", c.DeliveryPkScript) +
fmt.Sprintf("Inputs:") +
inputs +