cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

address review

Browse Source
This commit is contained in:
Alfonso de la Rocha 2023-03-10 09:27:30 +01:00
parent 3988cc9b2c
commit c11ffa58a8
No known key found for this signature in database
GPG Key ID: B7BEF4B895F2B535
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chain/sub/incoming.go
View File

@ -111,7 +111,7 @@ func HandleIncomingBlocks(ctx context.Context, bsub *pubsub.Subscription, self p
// If we are the block proposers we don't need to wait for delivery, we know the blocks are // If we are the block proposers we don't need to wait for delivery, we know the blocks are
// honest. // honest.
if src != self { if src != self {
log.Infof("Waiting for consistent broadcast of block in height: %v", blk.Header.Height) log.Debugf("Waiting for consistent broadcast of block in height: %v", blk.Header.Height)
if err := cb.WaitForDelivery(blk.Header); err != nil { if err := cb.WaitForDelivery(blk.Header); err != nil {
log.Errorf("couldn't deliver block to syncer over pubsub: %s; source: %s", err, src) log.Errorf("couldn't deliver block to syncer over pubsub: %s; source: %s", err, src)
return return
@ -119,7 +119,7 @@ func HandleIncomingBlocks(ctx context.Context, bsub *pubsub.Subscription, self p
} }
// Garbage collect the broadcast state // Garbage collect the broadcast state
cb.GarbageCollect(blk.Header.Height) cb.GarbageCollect(blk.Header.Height)
log.Infof("Block in height %v delivered successfully (cid=)", blk.Header.Height, blk.Cid()) log.Debugf("Block in height %v delivered successfully (cid=)", blk.Header.Height, blk.Cid())
if s.InformNewBlock(msg.ReceivedFrom, &types.FullBlock{ if s.InformNewBlock(msg.ReceivedFrom, &types.FullBlock{
Header: blk.Header, Header: blk.Header,

10
itests/kit/init.go
View File

@ -3,7 +3,6 @@ package kit
import ( import (
"fmt" "fmt"
"os" "os"
"time"
logging "github.com/ipfs/go-log/v2" logging "github.com/ipfs/go-log/v2"
@ -41,11 +40,10 @@ func init() {
build.InsecurePoStValidation = true build.InsecurePoStValidation = true
// NOTE: If we want the payment channel itests to pass that use a // Disabling consistent broadcast in itests. Many tests use really fast
// block time of 5*millisecond, we need to set the consistent broadcast // block times, and adding this additional delay for block delivery
// delay to something lower than that block time. // would make these tests to fail.
// todo: configure such a low delay only for paych tests. build.CBDeliveryDelay = 0
build.CBDeliveryDelay = 2 * time.Millisecond
if err := os.Setenv("BELLMAN_NO_GPU", "1"); err != nil { if err := os.Setenv("BELLMAN_NO_GPU", "1"); err != nil {
panic(fmt.Sprintf("failed to set BELLMAN_NO_GPU env variable: %s", err)) panic(fmt.Sprintf("failed to set BELLMAN_NO_GPU env variable: %s", err))