status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

light: fixed data race in TestTxPool

This commit is contained in:
Zsolt Felfoldi 2017-01-06 03:44:58 +01:00
parent 93f9c023cc
commit 66979aa468
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
light/txpool_test.go
View File

@ -32,20 +32,22 @@ import (
) )
type testTxRelay struct { type testTxRelay struct {
send, nhMined, nhRollback, discard int send, discard, mined chan int
} }
func (self *testTxRelay) Send(txs types.Transactions) { func (self *testTxRelay) Send(txs types.Transactions) {
self.send = len(txs) self.send <- len(txs)
} }
func (self *testTxRelay) NewHead(head common.Hash, mined []common.Hash, rollback []common.Hash) { func (self *testTxRelay) NewHead(head common.Hash, mined []common.Hash, rollback []common.Hash) {
self.nhMined = len(mined) m := len(mined)
self.nhRollback = len(rollback) if m != 0 {
self.mined <- m
}
} }
func (self *testTxRelay) Discard(hashes []common.Hash) { func (self *testTxRelay) Discard(hashes []common.Hash) {
self.discard = len(hashes) self.discard <- len(hashes)
} }
const poolTestTxs = 1000 const poolTestTxs = 1000
@ -94,7 +96,11 @@ func TestTxPool(t *testing.T) {
} }
odr := &testOdr{sdb: sdb, ldb: ldb} odr := &testOdr{sdb: sdb, ldb: ldb}
relay := &testTxRelay{} relay := &testTxRelay{
send: make(chan int, 1),
discard: make(chan int, 1),
mined: make(chan int, 1),
}
lightchain, _ := NewLightChain(odr, testChainConfig(), pow, evmux) lightchain, _ := NewLightChain(odr, testChainConfig(), pow, evmux)
lightchain.SetValidator(bproc{}) lightchain.SetValidator(bproc{})
txPermanent = 50 txPermanent = 50
@ -106,36 +112,33 @@ func TestTxPool(t *testing.T) {
s := sentTx(i - 1) s := sentTx(i - 1)
e := sentTx(i) e := sentTx(i)
for i := s; i < e; i++ { for i := s; i < e; i++ {
relay.send = 0
pool.Add(ctx, testTx[i]) pool.Add(ctx, testTx[i])
got := relay.send got := <-relay.send
exp := 1 exp := 1
if got != exp { if got != exp {
t.Errorf("relay.Send expected len = %d, got %d", exp, got) t.Errorf("relay.Send expected len = %d, got %d", exp, got)
} }
} }
relay.nhMined = 0
relay.nhRollback = 0
relay.discard = 0
if _, err := lightchain.InsertHeaderChain([]*types.Header{block.Header()}, 1); err != nil { if _, err := lightchain.InsertHeaderChain([]*types.Header{block.Header()}, 1); err != nil {
panic(err) panic(err)
} }
time.Sleep(time.Millisecond * 30)
got := relay.nhMined got := <-relay.mined
exp := minedTx(i) - minedTx(i-1) exp := minedTx(i) - minedTx(i-1)
if got != exp { if got != exp {
t.Errorf("relay.NewHead expected len(mined) = %d, got %d", exp, got) t.Errorf("relay.NewHead expected len(mined) = %d, got %d", exp, got)
} }
got = relay.discard
exp = 0 exp = 0
if i > int(txPermanent)+1 { if i > int(txPermanent)+1 {
exp = minedTx(i-int(txPermanent)-1) - minedTx(i-int(txPermanent)-2) exp = minedTx(i-int(txPermanent)-1) - minedTx(i-int(txPermanent)-2)
} }
if got != exp { if exp != 0 {
t.Errorf("relay.Discard expected len = %d, got %d", exp, got) got = <-relay.discard
if got != exp {
t.Errorf("relay.Discard expected len = %d, got %d", exp, got)
}
} }
} }
} }