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

fix tree list

parent 23e7c107
...@@ -618,7 +618,8 @@ func (web *WebServicer) sleep(done <-chan interface{}, valueStream <-chan interf ...@@ -618,7 +618,8 @@ func (web *WebServicer) sleep(done <-chan interface{}, valueStream <-chan interf
go func() { go func() {
defer close(sleepStream) defer close(sleepStream)
sleepTicker := time.NewTicker(s)
sleepTicker := &time.Ticker{}
first := true first := true
for val := range web.orDone(done, valueStream) { for val := range web.orDone(done, valueStream) {
...@@ -626,6 +627,7 @@ func (web *WebServicer) sleep(done <-chan interface{}, valueStream <-chan interf ...@@ -626,6 +627,7 @@ func (web *WebServicer) sleep(done <-chan interface{}, valueStream <-chan interf
if first { if first {
sleepStream <- val sleepStream <- val
first = false first = false
sleepTicker = time.NewTicker(s)
continue continue
} }
...@@ -779,9 +781,10 @@ func (web *WebServicer) sendBatchTxsFromQueue(fromAddr string, toAddrs []string, ...@@ -779,9 +781,10 @@ func (web *WebServicer) sendBatchTxsFromQueue(fromAddr string, toAddrs []string,
} }
} }
if (k+1)%(batchTxSize) == 0 || k == len(txFs)-1 {
h := sha256.New() if (k+1)%(batchTxSize) == 0 || k == len(txFs)-1 {
fmt.Println("if (k+1)%(batchTxSize) == 0 || k == len(txFs)-1 {-------")
h := sha256.New()
if _, err := h.Write(txsBytes); err != nil { if _, err := h.Write(txsBytes); err != nil {
return err return err
} }
......
...@@ -491,7 +491,7 @@ func TestOrDone(t *testing.T) { ...@@ -491,7 +491,7 @@ func TestOrDone(t *testing.T) {
originalTxParam.Nonce++ originalTxParam.Nonce++
valueStream <- originalTxParam.Nonce valueStream <- originalTxParam.Nonce
if originalTxParam.Nonce == 3 { if originalTxParam.Nonce == 30 {
close(valueStream) close(valueStream)
return return
} }
......
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