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

remove error from rcvBlock. type/docs gen

Browse Source
This commit is contained in:
Alfonso de la Rocha 2022-12-13 12:13:20 +01:00
parent 91bd679d1e
commit f2cc452d4c
No known key found for this signature in database
GPG Key ID: B7BEF4B895F2B535
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/params_2k.go
View File

@ -134,5 +134,5 @@ const BootstrapPeerThreshold = 1
var WhitelistedBlock = cid.Undef var WhitelistedBlock = cid.Undef
// Reducing the delivery delay for equivocation of // Reducing the delivery delay for equivocation of
// consistent broadcast to just one second. // consistent broadcast to just half a second.
const CBDeliveryDelay = 1 * time.Second const CBDeliveryDelay = 500 * time.Milisecond

25
chain/sub/bcast/consistent.go
View File

@ -7,12 +7,17 @@ import (
"sync" "sync"
"time" "time"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/lotus/chain/types"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
logging "github.com/ipfs/go-log/v2"
"github.com/multiformats/go-multihash" "github.com/multiformats/go-multihash"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/lotus/chain/types"
) )
var log = logging.Logger("sub-cb")
const ( const (
// GcSanityCheck determines the number of epochs that in the past // GcSanityCheck determines the number of epochs that in the past
// that will be garbage collected from the current epoch. // that will be garbage collected from the current epoch.
@ -86,14 +91,14 @@ func cidExists(cids []cid.Cid, c cid.Cid) bool {
func (bInfo *blksInfo) eqErr() error { func (bInfo *blksInfo) eqErr() error {
bInfo.cancel() bInfo.cancel()
return fmt.Errorf("equivocation error detected. Different block with the same ticket already seen") return fmt.Errorf("different blocks with the same ticket already seen")
} }
func (cb *ConsistentBCast) Len() int { func (cb *ConsistentBCast) Len() int {
return len(cb.m) return len(cb.m)
} }
func (cb *ConsistentBCast) RcvBlock(ctx context.Context, blk *types.BlockMsg) error { func (cb *ConsistentBCast) RcvBlock(ctx context.Context, blk *types.BlockMsg) {
cb.lk.Lock() cb.lk.Lock()
bcastDict, ok := cb.m[blk.Header.Height] bcastDict, ok := cb.m[blk.Header.Height]
if !ok { if !ok {
@ -103,26 +108,28 @@ func (cb *ConsistentBCast) RcvBlock(ctx context.Context, blk *types.BlockMsg) er
cb.lk.Unlock() cb.lk.Unlock()
key, err := BCastKey(blk.Header) key, err := BCastKey(blk.Header)
if err != nil { if err != nil {
return err log.Errorf("couldn't hash blk info for height %d: %s", blk.Header.Height, err)
return
} }
blkCid := blk.Cid() blkCid := blk.Cid()
bInfo, ok := bcastDict.load(key) bInfo, ok := bcastDict.load(key)
if ok { if ok {
if len(bInfo.blks) > 1 { if len(bInfo.blks) > 1 {
return bInfo.eqErr() log.Errorf("equivocation detected for height %d: %s", blk.Header.Height, bInfo.eqErr())
return
} }
if !cidExists(bInfo.blks, blkCid) { if !cidExists(bInfo.blks, blkCid) {
bInfo.blks = append(bInfo.blks, blkCid) bInfo.blks = append(bInfo.blks, blkCid)
return bInfo.eqErr() log.Errorf("equivocation detected for height %d: %s", blk.Header.Height, bInfo.eqErr())
return
} }
return nil return
} }
ctx, cancel := context.WithTimeout(ctx, cb.delay) ctx, cancel := context.WithTimeout(ctx, cb.delay)
bcastDict.store(key, &blksInfo{ctx, cancel, []cid.Cid{blkCid}}) bcastDict.store(key, &blksInfo{ctx, cancel, []cid.Cid{blkCid}})
return nil
} }
func (cb *ConsistentBCast) WaitForDelivery(bh *types.BlockHeader) error { func (cb *ConsistentBCast) WaitForDelivery(bh *types.BlockHeader) error {

10
chain/sub/bcast/consistent_test.go
View File

@ -10,13 +10,15 @@ import (
"testing" "testing"
"time" "time"
"github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/lotus/chain/sub/bcast"
"github.com/filecoin-project/lotus/chain/types"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
"github.com/multiformats/go-multihash" "github.com/multiformats/go-multihash"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/lotus/chain/sub/bcast"
"github.com/filecoin-project/lotus/chain/types"
) )
const TEST_DELAY = 1 * time.Second const TEST_DELAY = 1 * time.Second