Changed TxIn.PreviousOutpoint to TxIn.PreviousOutPoint after btcwire API change.

This commit is contained in:
Jonathan Gillham 2014-10-01 13:52:19 +01:00
parent 2a688a70b2
commit 968b6da5db
5 changed files with 15 additions and 15 deletions

View file

@ -56,10 +56,10 @@ out:
var txneededList []*btcwire.ShaHash var txneededList []*btcwire.ShaHash
for _, tx := range mblock.Transactions { for _, tx := range mblock.Transactions {
for _, txin := range tx.TxIn { for _, txin := range tx.TxIn {
if txin.PreviousOutpoint.Index == uint32(4294967295) { if txin.PreviousOutPoint.Index == uint32(4294967295) {
continue continue
} }
origintxsha := &txin.PreviousOutpoint.Hash origintxsha := &txin.PreviousOutPoint.Hash
txneededList = append(txneededList, origintxsha) txneededList = append(txneededList, origintxsha)
exists, err := db.ExistsTxSha(origintxsha) exists, err := db.ExistsTxSha(origintxsha)

View file

@ -74,12 +74,12 @@ endtest:
var txInList []*btcwire.OutPoint var txInList []*btcwire.OutPoint
for _, tx := range mblock.Transactions { for _, tx := range mblock.Transactions {
for _, txin := range tx.TxIn { for _, txin := range tx.TxIn {
if txin.PreviousOutpoint.Index == uint32(4294967295) { if txin.PreviousOutPoint.Index == uint32(4294967295) {
continue continue
} }
origintxsha := &txin.PreviousOutpoint.Hash origintxsha := &txin.PreviousOutPoint.Hash
txInList = append(txInList, &txin.PreviousOutpoint) txInList = append(txInList, &txin.PreviousOutPoint)
txneededList = append(txneededList, origintxsha) txneededList = append(txneededList, origintxsha)
txlookupList = append(txlookupList, origintxsha) txlookupList = append(txlookupList, origintxsha)

View file

@ -455,8 +455,8 @@ func (db *LevelDb) doSpend(tx *btcwire.MsgTx) error {
for txinidx := range tx.TxIn { for txinidx := range tx.TxIn {
txin := tx.TxIn[txinidx] txin := tx.TxIn[txinidx]
inTxSha := txin.PreviousOutpoint.Hash inTxSha := txin.PreviousOutPoint.Hash
inTxidx := txin.PreviousOutpoint.Index inTxidx := txin.PreviousOutPoint.Index
if inTxidx == ^uint32(0) { if inTxidx == ^uint32(0) {
continue continue
@ -478,8 +478,8 @@ func (db *LevelDb) unSpend(tx *btcwire.MsgTx) error {
for txinidx := range tx.TxIn { for txinidx := range tx.TxIn {
txin := tx.TxIn[txinidx] txin := tx.TxIn[txinidx]
inTxSha := txin.PreviousOutpoint.Hash inTxSha := txin.PreviousOutPoint.Hash
inTxidx := txin.PreviousOutpoint.Index inTxidx := txin.PreviousOutPoint.Index
if inTxidx == ^uint32(0) { if inTxidx == ^uint32(0) {
continue continue

View file

@ -65,10 +65,10 @@ out:
var txneededList []*btcwire.ShaHash var txneededList []*btcwire.ShaHash
for _, tx := range mblock.Transactions { for _, tx := range mblock.Transactions {
for _, txin := range tx.TxIn { for _, txin := range tx.TxIn {
if txin.PreviousOutpoint.Index == uint32(4294967295) { if txin.PreviousOutPoint.Index == uint32(4294967295) {
continue continue
} }
origintxsha := &txin.PreviousOutpoint.Hash origintxsha := &txin.PreviousOutPoint.Hash
txneededList = append(txneededList, origintxsha) txneededList = append(txneededList, origintxsha)
exists, err := db.ExistsTxSha(origintxsha) exists, err := db.ExistsTxSha(origintxsha)

View file

@ -52,7 +52,7 @@ func newShaHashFromStr(hexStr string) *btcwire.ShaHash {
// a single input that has a previous output transaction index set to the // a single input that has a previous output transaction index set to the
// maximum value along with a zero hash. // maximum value along with a zero hash.
func isCoinbaseInput(txIn *btcwire.TxIn) bool { func isCoinbaseInput(txIn *btcwire.TxIn) bool {
prevOut := &txIn.PreviousOutpoint prevOut := &txIn.PreviousOutPoint
if prevOut.Index == math.MaxUint32 && prevOut.Hash.IsEqual(&zeroHash) { if prevOut.Index == math.MaxUint32 && prevOut.Hash.IsEqual(&zeroHash) {
return true return true
} }
@ -105,7 +105,7 @@ func (db *MemDb) removeTx(msgTx *btcwire.MsgTx, txHash *btcwire.ShaHash) {
continue continue
} }
prevOut := &txIn.PreviousOutpoint prevOut := &txIn.PreviousOutPoint
originTxns, exists := db.txns[prevOut.Hash] originTxns, exists := db.txns[prevOut.Hash]
if !exists { if !exists {
log.Warnf("Unable to find input transaction %s to "+ log.Warnf("Unable to find input transaction %s to "+
@ -593,7 +593,7 @@ func (db *MemDb) InsertBlock(block *btcutil.Block) (int64, error) {
// the output of another transaction in this block only // the output of another transaction in this block only
// if the referenced transaction comes before the // if the referenced transaction comes before the
// current one in this block. // current one in this block.
prevOut := &txIn.PreviousOutpoint prevOut := &txIn.PreviousOutPoint
if inFlightIndex, ok := txInFlight[prevOut.Hash]; ok { if inFlightIndex, ok := txInFlight[prevOut.Hash]; ok {
if i <= inFlightIndex { if i <= inFlightIndex {
log.Warnf("InsertBlock: requested hash "+ log.Warnf("InsertBlock: requested hash "+
@ -661,7 +661,7 @@ func (db *MemDb) InsertBlock(block *btcutil.Block) (int64, error) {
} }
// Already checked for existing and valid ranges above. // Already checked for existing and valid ranges above.
prevOut := &txIn.PreviousOutpoint prevOut := &txIn.PreviousOutPoint
originTxns := db.txns[prevOut.Hash] originTxns := db.txns[prevOut.Hash]
originTxD := originTxns[len(originTxns)-1] originTxD := originTxns[len(originTxns)-1]
originTxD.spentBuf[prevOut.Index] = true originTxD.spentBuf[prevOut.Index] = true