lnwire: fixing buffer size and cleaning up uint16/32 conversion
This commit removes an unnecessarely large 32 byte buffer in favor of a small 2 byte buffer and cleans up type conversion between uint16 and uint32 values.
This commit is contained in:
parent
91d716be1f
commit
b77bb73d4c
@ -56,11 +56,11 @@ func NewChanIDFromOutPoint(op *wire.OutPoint) ChannelID {
|
|||||||
// ChannelID. To do this, we expect the cid parameter to contain the txid
|
// ChannelID. To do this, we expect the cid parameter to contain the txid
|
||||||
// unaltered and the outputIndex to be the output index
|
// unaltered and the outputIndex to be the output index
|
||||||
func xorTxid(cid *ChannelID, outputIndex uint16) {
|
func xorTxid(cid *ChannelID, outputIndex uint16) {
|
||||||
var buf [32]byte
|
var buf [2]byte
|
||||||
binary.BigEndian.PutUint16(buf[30:], outputIndex)
|
binary.BigEndian.PutUint16(buf[:], outputIndex)
|
||||||
|
|
||||||
cid[30] = cid[30] ^ buf[30]
|
cid[30] ^= buf[0]
|
||||||
cid[31] = cid[31] ^ buf[31]
|
cid[31] ^= buf[1]
|
||||||
}
|
}
|
||||||
|
|
||||||
// GenPossibleOutPoints generates all the possible outputs given a channel ID.
|
// GenPossibleOutPoints generates all the possible outputs given a channel ID.
|
||||||
@ -69,13 +69,13 @@ func xorTxid(cid *ChannelID, outputIndex uint16) {
|
|||||||
// mapping from channelID back to OutPoint.
|
// mapping from channelID back to OutPoint.
|
||||||
func (c *ChannelID) GenPossibleOutPoints() [MaxFundingTxOutputs]wire.OutPoint {
|
func (c *ChannelID) GenPossibleOutPoints() [MaxFundingTxOutputs]wire.OutPoint {
|
||||||
var possiblePoints [MaxFundingTxOutputs]wire.OutPoint
|
var possiblePoints [MaxFundingTxOutputs]wire.OutPoint
|
||||||
for i := uint32(0); i < MaxFundingTxOutputs; i++ {
|
for i := uint16(0); i < MaxFundingTxOutputs; i++ {
|
||||||
cidCopy := *c
|
cidCopy := *c
|
||||||
xorTxid(&cidCopy, uint16(i))
|
xorTxid(&cidCopy, i)
|
||||||
|
|
||||||
possiblePoints[i] = wire.OutPoint{
|
possiblePoints[i] = wire.OutPoint{
|
||||||
Hash: chainhash.Hash(cidCopy),
|
Hash: chainhash.Hash(cidCopy),
|
||||||
Index: i,
|
Index: uint32(i),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user