This commit is contained in:
Dave Collins 2013-10-13 13:02:45 -05:00
parent 1f87ee217a
commit 2ec9511891
3 changed files with 5 additions and 6 deletions

View File

@ -82,7 +82,7 @@ func (db *LevelDb) fetchTxDataBySha(txsha *btcwire.ShaHash) (rtx *btcwire.MsgTx,
//log.Trace("transaction %v is at block %v %v txoff %v, txlen %v\n", //log.Trace("transaction %v is at block %v %v txoff %v, txlen %v\n",
// txsha, blksha, blkHeight, txOff, txLen) // txsha, blksha, blkHeight, txOff, txLen)
rbuf := bytes.NewBuffer(blkbuf[txOff:txOff+txLen]) rbuf := bytes.NewBuffer(blkbuf[txOff : txOff+txLen])
var tx btcwire.MsgTx var tx btcwire.MsgTx
err = tx.Deserialize(rbuf) err = tx.Deserialize(rbuf)
@ -102,7 +102,7 @@ func (db *LevelDb) FetchTxBySha(txsha *btcwire.ShaHash) ([]*btcdb.TxListReply, e
return []*btcdb.TxListReply{}, err return []*btcdb.TxListReply{}, err
} }
replies := make ([]*btcdb.TxListReply, 1) replies := make([]*btcdb.TxListReply, 1)
btxspent := make([]bool, len(tx.TxOut), len(tx.TxOut)) btxspent := make([]bool, len(tx.TxOut), len(tx.TxOut))
for idx := range tx.TxOut { for idx := range tx.TxOut {

View File

@ -10,10 +10,10 @@ import (
"github.com/conformal/btcdb" "github.com/conformal/btcdb"
"github.com/conformal/btcutil" "github.com/conformal/btcutil"
"github.com/conformal/btcwire" "github.com/conformal/btcwire"
"github.com/conformal/seelog"
"github.com/conformal/goleveldb/leveldb" "github.com/conformal/goleveldb/leveldb"
"github.com/conformal/goleveldb/leveldb/cache" "github.com/conformal/goleveldb/leveldb/cache"
"github.com/conformal/goleveldb/leveldb/opt" "github.com/conformal/goleveldb/leveldb/opt"
"github.com/conformal/seelog"
"os" "os"
"runtime" "runtime"
"sync" "sync"

View File

@ -242,7 +242,7 @@ func (db *SqliteDb) FetchTxBySha(txsha *btcwire.ShaHash) ([]*btcdb.TxListReply,
// Check Tx cache // Check Tx cache
if txc, ok := db.fetchTxCache(txsha); ok { if txc, ok := db.fetchTxCache(txsha); ok {
replies := make ([]*btcdb.TxListReply, 1) replies := make([]*btcdb.TxListReply, 1)
tx := txc.tx tx := txc.tx
btxspent := make([]bool, len(tx.TxOut), len(tx.TxOut)) btxspent := make([]bool, len(tx.TxOut), len(tx.TxOut))
@ -308,7 +308,6 @@ func (db *SqliteDb) FetchTxBySha(txsha *btcwire.ShaHash) ([]*btcdb.TxListReply,
txc.blksha = *blksha txc.blksha = *blksha
db.insertTxCache(&txc) db.insertTxCache(&txc)
btxspent := make([]bool, len(tx.TxOut), len(tx.TxOut)) btxspent := make([]bool, len(tx.TxOut), len(tx.TxOut))
for idx := range tx.TxOut { for idx := range tx.TxOut {
byteidx := idx / 8 byteidx := idx / 8
@ -316,7 +315,7 @@ func (db *SqliteDb) FetchTxBySha(txsha *btcwire.ShaHash) ([]*btcdb.TxListReply,
btxspent[idx] = (txspent[byteidx] & (byte(1) << byteoff)) != 0 btxspent[idx] = (txspent[byteidx] & (byte(1) << byteoff)) != 0
} }
replies := make ([]*btcdb.TxListReply, 1) replies := make([]*btcdb.TxListReply, 1)
txlre := btcdb.TxListReply{Sha: txsha, Tx: &tx, BlkSha: blksha, Height: height, TxSpent: btxspent, Err: err} txlre := btcdb.TxListReply{Sha: txsha, Tx: &tx, BlkSha: blksha, Height: height, TxSpent: btxspent, Err: err}
replies[0] = &txlre replies[0] = &txlre
return replies, nil return replies, nil