roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Fixed tests

Browse Source
This commit is contained in:
obscuren 2015-01-02 11:16:30 +01:00
parent a4dc12f12c
commit b619b244c7
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/chain_manager_test.go
View File

@ -27,6 +27,9 @@ func init() {
ethutil.ReadConfig("/tmp/ethtest", "/tmp/ethtest", "ETH") ethutil.ReadConfig("/tmp/ethtest", "/tmp/ethtest", "ETH")
}
func reset() {
db, err := ethdb.NewMemDatabase() db, err := ethdb.NewMemDatabase()
if err != nil { if err != nil {
panic("Could not create mem-db, failing") panic("Could not create mem-db, failing")
@ -51,20 +54,21 @@ func loadChain(fn string, t *testing.T) (types.Blocks, error) {
func insertChain(done chan bool, chainMan *ChainManager, chain types.Blocks, t *testing.T) { func insertChain(done chan bool, chainMan *ChainManager, chain types.Blocks, t *testing.T) {
err := chainMan.InsertChain(chain) err := chainMan.InsertChain(chain)
done <- true
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
t.FailNow() t.FailNow()
} }
done <- true
} }
func TestChainInsertions(t *testing.T) { func TestChainInsertions(t *testing.T) {
reset()
chain1, err := loadChain("valid1", t) chain1, err := loadChain("valid1", t)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
t.FailNow() t.FailNow()
} }
fmt.Println(len(chain1))
chain2, err := loadChain("valid2", t) chain2, err := loadChain("valid2", t)
if err != nil { if err != nil {
@ -98,6 +102,8 @@ func TestChainInsertions(t *testing.T) {
} }
func TestChainMultipleInsertions(t *testing.T) { func TestChainMultipleInsertions(t *testing.T) {
reset()
const max = 4 const max = 4
chains := make([]types.Blocks, max) chains := make([]types.Blocks, max)
var longest int var longest int
@ -114,7 +120,6 @@ func TestChainMultipleInsertions(t *testing.T) {
t.FailNow() t.FailNow()
} }
} }
var eventMux event.TypeMux var eventMux event.TypeMux
chainMan := NewChainManager(&eventMux) chainMan := NewChainManager(&eventMux)
txPool := NewTxPool(chainMan, &eventMux) txPool := NewTxPool(chainMan, &eventMux)
@ -122,7 +127,9 @@ func TestChainMultipleInsertions(t *testing.T) {
chainMan.SetProcessor(blockMan) chainMan.SetProcessor(blockMan)
done := make(chan bool, max) done := make(chan bool, max)
for i, chain := range chains { for i, chain := range chains {
var i int = i // XXX the go routine would otherwise reference the same (chain[3]) variable and fail
i := i
chain := chain
go func() { go func() {
insertChain(done, chainMan, chain, t) insertChain(done, chainMan, chain, t)
fmt.Println(i, "done") fmt.Println(i, "done")