mirror of
https://github.com/luxfi/bft.git
synced 2026-10-30 17:01:54 +00:00
zeekayandHanzo Dev
d678c2d213
Reapplies the fork's whole delta on top of the merge, as one reviewable diff rather than 43 conflict resolutions. Nothing here changes consensus behaviour. - module github.com/luxfi/bft, Go 1.26.4; root package simplex -> bft, which would otherwise collide with the simplex/ subpackage under this module name. - go.uber.org/zap -> github.com/luxfi/log, so common.Logger takes ...log.Field. zap.Error maps to log.Err: log.Error is luxfi/log's package-level logging function, not a field constructor, and the compiler is the only thing that catches that. Needs luxfi/log v1.6.1 for the Stringers constructor. - avalanchego/ -> host/. The package holds NodeID, VMBlock, Bitmask and size limits — the host node's types, vendored to avoid importing a whole node — so it is named for what it holds. Renaming it luxd/ would have swapped one brand for another and said just as little. - testutil/logger.go reimplemented without zapcore. Upstream layers a keyword-filtering Core, a debug-swallowing Encoder and a Tee because that is zap's extension model; luxfi/log has no such seam, so every policy is applied in one emit. That also fixes two defects the layering caused: SilenceExceptKeywords rebuilt the logger and discarded an installed Intercept hook, and the two sinks read different env vars (LOG_LEVEL vs log_level) so they disagreed about suppressing debug. Hooks run outside the lock, so a hook that logs fails the test instead of deadlocking it. Fatal panics rather than exiting, because exiting takes the suite down with no attribution. - simplex/monitor_test.go keeps a local logger: testutil imports simplex, so an internal test cannot import testutil back without closing a cycle. - README keeps the name Simplex throughout — it is the protocol's own name and the subject of reference [1]. Only the deployment target changed. The HyperSDK sentence still says Avalanche because that sentence is true. - Drops the fork's Makefile: it duplicated unit-tests.sh and fuzz.sh, and ran the suite with -timeout 30s when simplex alone needs over 100s. Co-authored-by: Hanzo Dev <[email protected]>
73 lines
1.6 KiB
Go
73 lines
1.6 KiB
Go
// Copyright (C) 2019-2025, Ava Labs, Inc. All rights reserved.
|
|
// See the file LICENSE for licensing terms.
|
|
|
|
package testutil
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/luxfi/bft/common"
|
|
)
|
|
|
|
type TestBlockBuilder struct {
|
|
// built is a channel that holds built test blocks
|
|
built chan *TestBlock
|
|
BlockShouldBeBuilt chan struct{}
|
|
}
|
|
|
|
func NewTestBlockBuilder() *TestBlockBuilder {
|
|
return &TestBlockBuilder{
|
|
built: make(chan *TestBlock, 1),
|
|
BlockShouldBeBuilt: make(chan struct{}, 1),
|
|
}
|
|
}
|
|
|
|
func (t *TestBlockBuilder) WithBuiltBuffer(buffer uint64) *TestBlockBuilder {
|
|
t.built = make(chan *TestBlock, buffer)
|
|
return t
|
|
}
|
|
|
|
func (t *TestBlockBuilder) WithBlockShouldBeBuiltBuffer(buffer uint64) *TestBlockBuilder {
|
|
t.BlockShouldBeBuilt = make(chan struct{}, buffer)
|
|
return t
|
|
}
|
|
|
|
func (t *TestBlockBuilder) BuildBlock(_ context.Context, metadata common.ProtocolMetadata, blacklist common.Blacklist) (common.VerifiedBlock, bool) {
|
|
tb := NewTestBlock(metadata, blacklist)
|
|
|
|
select {
|
|
case t.built <- tb:
|
|
return tb, true
|
|
default:
|
|
}
|
|
return tb, true
|
|
}
|
|
|
|
func (t *TestBlockBuilder) GetBuiltBlock() *TestBlock {
|
|
timeout := time.NewTimer(10 * time.Second)
|
|
defer timeout.Stop()
|
|
|
|
select {
|
|
case b := <-t.built:
|
|
return b
|
|
case <-timeout.C:
|
|
panic("timed out waiting for built block")
|
|
}
|
|
}
|
|
|
|
func (t *TestBlockBuilder) SetBuiltBlock(block *TestBlock) {
|
|
select {
|
|
case t.built <- block:
|
|
default:
|
|
panic("built channel is full")
|
|
}
|
|
}
|
|
|
|
func (t *TestBlockBuilder) WaitForPendingBlock(ctx context.Context) {
|
|
select {
|
|
case <-t.BlockShouldBeBuilt:
|
|
case <-ctx.Done():
|
|
}
|
|
}
|