Commit 11a717b6 authored by 李伟@五瓣科技's avatar 李伟@五瓣科技

fix tree list

parent b52fc05b
......@@ -752,20 +752,18 @@ func (web *WebServicer) sendBatchTxsFromQueue(fromAddr string, toAddrs []string,
consTxWithBatchs := make([]ConsTxWithBatchHash, 0, batchTxHashSize)
var beginOriginalTx common.Hash
var endOriginalTx common.Hash
var hashesBytes []byte = make([]byte, 0, 32*batchTxHashSize)
for k, txAsInterface := range txFs {
var hashesBytes []byte = make([]byte, 0, 32*batchTxHashSize)
//
var txsBytes []byte
var batchTxs []TxWithFrom = make([]TxWithFrom, 0, batchTxSize)
for k, txAsInterface := range txFs {
if txF, ok := txAsInterface.(TxWithFrom); ok {
if k == 0 {
beginOriginalTx = txF.Tx.Hash()
}
// for j := 0; j < batchTxHashSize; j++ {
var txsBytes []byte
var batchTxs []TxWithFrom = make([]TxWithFrom, 0, batchTxSize)
for i := 0; i < batchTxSize; i++ {
batchTxs = append(batchTxs, txF)
......@@ -781,10 +779,9 @@ func (web *WebServicer) sendBatchTxsFromQueue(fromAddr string, toAddrs []string,
}
}
if (k+1)%(batchTxSize) == 0 || k == len(txFs)-1 {
fmt.Println("if (k+1)%(batchTxSize) == 0 || k == len(txFs)-1 {-------")
h := sha256.New()
h := sha256.New()
if _, err := h.Write(txsBytes); err != nil {
return err
}
......@@ -793,8 +790,10 @@ func (web *WebServicer) sendBatchTxsFromQueue(fromAddr string, toAddrs []string,
hashesBytes = append(hashesBytes, hashBytes...)
redisTxlist = append(redisTxlist, OriginalBatchTxs{Hash: hashBytes, Txs: batchTxs})
txsBytes = make([]byte, 0)
batchTxs = make([]TxWithFrom, 0, batchTxSize)
}
//}
if k == len(txFs)-1 {
......@@ -833,6 +832,8 @@ func (web *WebServicer) sendBatchTxsFromQueue(fromAddr string, toAddrs []string,
sendToRedisBeginTime := time.Now()
go func() {
for _, originalBatchTxs := range value.RedisTxList {
fmt.Printf("originalBatchTxs %v %v \n", originalBatchTxs.Hash, len(originalBatchTxs.Txs))
batchTxsForRedis <- &originalBatchTxs
}
}()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment