mirror of
https://gitlab.com/pulsechaincom/go-pulse.git
synced 2024-12-23 11:57:17 +00:00
eth, eth/downloader: don't require td on downloader. Fixed tests
This commit is contained in:
parent
b86e7526e1
commit
31f82eb334
@ -217,7 +217,7 @@ func New(config *Config) (*Ethereum, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux())
|
eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux())
|
||||||
eth.downloader = downloader.New(eth.chainManager.HasBlock, eth.chainManager.InsertChain, eth.chainManager.Td)
|
eth.downloader = downloader.New(eth.chainManager.HasBlock, eth.chainManager.InsertChain)
|
||||||
eth.pow = ethash.New(eth.chainManager)
|
eth.pow = ethash.New(eth.chainManager)
|
||||||
eth.txPool = core.NewTxPool(eth.EventMux(), eth.chainManager.State)
|
eth.txPool = core.NewTxPool(eth.EventMux(), eth.chainManager.State)
|
||||||
eth.blockProcessor = core.NewBlockProcessor(stateDb, extraDb, eth.pow, eth.txPool, eth.chainManager, eth.EventMux())
|
eth.blockProcessor = core.NewBlockProcessor(stateDb, extraDb, eth.pow, eth.txPool, eth.chainManager, eth.EventMux())
|
||||||
@ -448,7 +448,7 @@ func (self *Ethereum) SuggestPeer(nodeURL string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *Ethereum) Stop() {
|
func (s *Ethereum) Stop() {
|
||||||
s.txSub.Unsubscribe() // quits txBroadcastLoop
|
s.txSub.Unsubscribe() // quits txBroadcastLoop
|
||||||
|
|
||||||
s.protocolManager.Stop()
|
s.protocolManager.Stop()
|
||||||
s.txPool.Stop()
|
s.txPool.Stop()
|
||||||
|
@ -39,7 +39,6 @@ var (
|
|||||||
type hashCheckFn func(common.Hash) bool
|
type hashCheckFn func(common.Hash) bool
|
||||||
type chainInsertFn func(types.Blocks) error
|
type chainInsertFn func(types.Blocks) error
|
||||||
type hashIterFn func() (common.Hash, error)
|
type hashIterFn func() (common.Hash, error)
|
||||||
type currentTdFn func() *big.Int
|
|
||||||
|
|
||||||
type blockPack struct {
|
type blockPack struct {
|
||||||
peerId string
|
peerId string
|
||||||
@ -61,7 +60,6 @@ type Downloader struct {
|
|||||||
// Callbacks
|
// Callbacks
|
||||||
hasBlock hashCheckFn
|
hasBlock hashCheckFn
|
||||||
insertChain chainInsertFn
|
insertChain chainInsertFn
|
||||||
currentTd currentTdFn
|
|
||||||
|
|
||||||
// Status
|
// Status
|
||||||
fetchingHashes int32
|
fetchingHashes int32
|
||||||
@ -76,13 +74,12 @@ type Downloader struct {
|
|||||||
quit chan struct{}
|
quit chan struct{}
|
||||||
}
|
}
|
||||||
|
|
||||||
func New(hasBlock hashCheckFn, insertChain chainInsertFn, currentTd currentTdFn) *Downloader {
|
func New(hasBlock hashCheckFn, insertChain chainInsertFn) *Downloader {
|
||||||
downloader := &Downloader{
|
downloader := &Downloader{
|
||||||
queue: newqueue(),
|
queue: newqueue(),
|
||||||
peers: make(peers),
|
peers: make(peers),
|
||||||
hasBlock: hasBlock,
|
hasBlock: hasBlock,
|
||||||
insertChain: insertChain,
|
insertChain: insertChain,
|
||||||
currentTd: currentTd,
|
|
||||||
newPeerCh: make(chan *peer, 1),
|
newPeerCh: make(chan *peer, 1),
|
||||||
syncCh: make(chan syncPack, 1),
|
syncCh: make(chan syncPack, 1),
|
||||||
hashCh: make(chan []common.Hash, 1),
|
hashCh: make(chan []common.Hash, 1),
|
||||||
|
@ -49,7 +49,7 @@ type downloadTester struct {
|
|||||||
|
|
||||||
func newTester(t *testing.T, hashes []common.Hash, blocks map[common.Hash]*types.Block) *downloadTester {
|
func newTester(t *testing.T, hashes []common.Hash, blocks map[common.Hash]*types.Block) *downloadTester {
|
||||||
tester := &downloadTester{t: t, hashes: hashes, blocks: blocks, done: make(chan bool)}
|
tester := &downloadTester{t: t, hashes: hashes, blocks: blocks, done: make(chan bool)}
|
||||||
downloader := New(tester.hasBlock, tester.insertChain, func() *big.Int { return new(big.Int) })
|
downloader := New(tester.hasBlock, tester.insertChain)
|
||||||
tester.downloader = downloader
|
tester.downloader = downloader
|
||||||
|
|
||||||
return tester
|
return tester
|
||||||
@ -112,7 +112,8 @@ func TestDownload(t *testing.T) {
|
|||||||
minDesiredPeerCount = 4
|
minDesiredPeerCount = 4
|
||||||
blockTtl = 1 * time.Second
|
blockTtl = 1 * time.Second
|
||||||
|
|
||||||
hashes := createHashes(0, 1000)
|
targetBlocks := 1000
|
||||||
|
hashes := createHashes(0, targetBlocks)
|
||||||
blocks := createBlocksFromHashes(hashes)
|
blocks := createBlocksFromHashes(hashes)
|
||||||
tester := newTester(t, hashes, blocks)
|
tester := newTester(t, hashes, blocks)
|
||||||
|
|
||||||
@ -121,21 +122,21 @@ func TestDownload(t *testing.T) {
|
|||||||
tester.badBlocksPeer("peer3", big.NewInt(0), common.Hash{})
|
tester.badBlocksPeer("peer3", big.NewInt(0), common.Hash{})
|
||||||
tester.badBlocksPeer("peer4", big.NewInt(0), common.Hash{})
|
tester.badBlocksPeer("peer4", big.NewInt(0), common.Hash{})
|
||||||
|
|
||||||
success:
|
blox, err := tester.downloader.Synchronise("peer1", hashes[0])
|
||||||
select {
|
if err != nil {
|
||||||
case <-tester.done:
|
t.Error("download error", err)
|
||||||
break success
|
}
|
||||||
case <-time.After(10 * time.Second): // XXX this could actually fail on a slow computer
|
|
||||||
t.Error("timeout")
|
if len(blox) != targetBlocks {
|
||||||
|
t.Error("expected", targetBlocks, "have", len(blox))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestMissing(t *testing.T) {
|
func TestMissing(t *testing.T) {
|
||||||
t.Skip()
|
|
||||||
|
|
||||||
glog.SetV(logger.Detail)
|
glog.SetV(logger.Detail)
|
||||||
glog.SetToStderr(true)
|
glog.SetToStderr(true)
|
||||||
|
|
||||||
|
targetBlocks := 1000
|
||||||
hashes := createHashes(0, 1000)
|
hashes := createHashes(0, 1000)
|
||||||
extraHashes := createHashes(1001, 1003)
|
extraHashes := createHashes(1001, 1003)
|
||||||
blocks := createBlocksFromHashes(append(extraHashes, hashes...))
|
blocks := createBlocksFromHashes(append(extraHashes, hashes...))
|
||||||
@ -146,13 +147,12 @@ func TestMissing(t *testing.T) {
|
|||||||
hashes = append(extraHashes, hashes[:len(hashes)-1]...)
|
hashes = append(extraHashes, hashes[:len(hashes)-1]...)
|
||||||
tester.newPeer("peer2", big.NewInt(0), common.Hash{})
|
tester.newPeer("peer2", big.NewInt(0), common.Hash{})
|
||||||
|
|
||||||
success1:
|
blox, err := tester.downloader.Synchronise("peer1", hashes[0])
|
||||||
select {
|
if err != nil {
|
||||||
case <-tester.done:
|
t.Error("download error", err)
|
||||||
break success1
|
|
||||||
case <-time.After(10 * time.Second): // XXX this could actually fail on a slow computer
|
|
||||||
t.Error("timout")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tester.downloader.AddBlock("peer2", blocks[hashes[len(hashes)-1]], big.NewInt(10001))
|
if len(blox) != targetBlocks {
|
||||||
|
t.Error("expected", targetBlocks, "have", len(blox))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -134,14 +134,14 @@ out:
|
|||||||
if len(pm.peers) < minDesiredPeerCount {
|
if len(pm.peers) < minDesiredPeerCount {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
itimer.Stop()
|
|
||||||
|
|
||||||
// Find the best peer
|
// Find the best peer
|
||||||
peer := getBestPeer(pm.peers)
|
peer := getBestPeer(pm.peers)
|
||||||
if peer == nil {
|
if peer == nil {
|
||||||
glog.V(logger.Debug).Infoln("Sync attempt cancelled. No peers available")
|
glog.V(logger.Debug).Infoln("Sync attempt cancelled. No peers available")
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
itimer.Stop()
|
||||||
go pm.synchronise(peer)
|
go pm.synchronise(peer)
|
||||||
case <-itimer.C:
|
case <-itimer.C:
|
||||||
// The timer will make sure that the downloader keeps an active state
|
// The timer will make sure that the downloader keeps an active state
|
||||||
|
Loading…
Reference in New Issue
Block a user