Commit 295e0c1c authored by duanjinfei's avatar duanjinfei

updage commit proof

parent 64f4a42a
...@@ -49,12 +49,12 @@ func (p *ProofWorker) ProofStorage() { ...@@ -49,12 +49,12 @@ func (p *ProofWorker) ProofStorage() {
proofByte, err := json.Marshal(proof) proofByte, err := json.Marshal(proof)
if err != nil { if err != nil {
log.Error("Failed to marshal proof: ", err) log.Error("Failed to marshal proof: ", err)
return continue
} }
err = db.Put(proof.TaskId, proofByte) err = db.Put(proof.TaskId, proofByte)
if err != nil { if err != nil {
log.Error("leveldb put proof failed: ", err) log.Error("leveldb put proof failed: ", err)
return continue
} }
p.isCommitProof[proof.TaskId] = false p.isCommitProof[proof.TaskId] = false
} }
...@@ -63,15 +63,16 @@ func (p *ProofWorker) ProofStorage() { ...@@ -63,15 +63,16 @@ func (p *ProofWorker) ProofStorage() {
}(p.productProofChan) }(p.productProofChan)
timer := time.NewTicker(time.Minute) timer := time.NewTicker(time.Minute)
defer timer.Stop()
randomMinute := getRandInt() randomMinute := getRandInt()
for { for {
select { select {
case <-timer.C: case <-timer.C:
min := time.Now().Minute() min := time.Now().Minute()
if min == 0 {
randomMinute = getRandInt()
}
// 检查是否在指定时间范围内(40-59分钟) // 检查是否在指定时间范围内(40-59分钟)
if min >= 40 && min <= 59 && min == randomMinute { if min >= 40 && min <= 59 && min == randomMinute {
randomMinute = getRandInt()
proofs := make([]*witnessV1.Proof, 0) proofs := make([]*witnessV1.Proof, 0)
iter, err := db.NewIterator() iter, err := db.NewIterator()
if err != nil { if err != nil {
...@@ -87,7 +88,7 @@ func (p *ProofWorker) ProofStorage() { ...@@ -87,7 +88,7 @@ func (p *ProofWorker) ProofStorage() {
err := json.Unmarshal(iter.Value(), proof) err := json.Unmarshal(iter.Value(), proof)
if err != nil { if err != nil {
log.Error("Error parsing proof from database: ", err) log.Error("Error parsing proof from database: ", err)
return continue
} }
if p.isCommitProof[proof.TaskId] { if p.isCommitProof[proof.TaskId] {
continue continue
...@@ -102,6 +103,7 @@ func (p *ProofWorker) ProofStorage() { ...@@ -102,6 +103,7 @@ func (p *ProofWorker) ProofStorage() {
} }
if len(proofs) > 0 { if len(proofs) > 0 {
p.consumeProofChan <- proofs p.consumeProofChan <- proofs
log.Info("---------------------------Storage proof data---------------------------")
} }
} }
} }
...@@ -121,10 +123,11 @@ func (p *ProofWorker) CommitWitness() { ...@@ -121,10 +123,11 @@ func (p *ProofWorker) CommitWitness() {
pushProof, err := validatorClient.PushProof(context.Background(), proofsReq, grpc.EmptyCallOption{}) pushProof, err := validatorClient.PushProof(context.Background(), proofsReq, grpc.EmptyCallOption{})
if err != nil { if err != nil {
log.Error("Push proof failed :", err) log.Error("Push proof failed :", err)
return continue
} }
workload := pushProof.GetWorkload() workload := pushProof.GetWorkload()
log.Info("Push proof response received : %v", workload) log.Info("Push proof response received : %v", workload)
log.Info("---------------------------Commit witness data---------------------------")
} }
} }
} }
......
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