poanetwork
/
istanbul-tools
mirror of https://github.com/poanetwork/istanbul-tools.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test: refactor new blockchain function.

This commit is contained in:
Yute Lin 2017-08-23 13:59:37 +08:00
parent dd4da1b579
commit 0f62f4a792
6 changed files with 22 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
container/blockchain.go
View File

@ -53,6 +53,23 @@ func NewBlockchain(numOfValidators int, options ...Option) (bc *blockchain) {
return bc
}
func NewDefaultBlockchain(numOfValidators int) (bc *blockchain) {
return NewBlockchain(numOfValidators,
ImageRepository("quay.io/amis/geth"),
ImageTag("istanbul_develop"),
DataDir("/data"),
WebSocket(),
WebSocketAddress("0.0.0.0"),
WebSocketAPI("admin,eth,net,web3,personal,miner,istanbul"),
WebSocketOrigin("*"),
NAT("any"),
NoDiscover(),
Etherbase("1a9afb711302c5f83b5902843d1c007a1a137632"),
Mine(),
Logging(false),
)
}
// ----------------------------------------------------------------------------
type blockchain struct {

17
tests/dynamic_test.go
View File

@ -35,22 +35,7 @@ var _ = Describe("Dynamic validators addition/removal testing", func() {
)
BeforeEach(func() {
blockchain = container.NewBlockchain(
numberOfValidators,
container.ImageRepository("quay.io/amis/geth"),
container.ImageTag("istanbul_develop"),
container.DataDir("/data"),
container.WebSocket(),
container.WebSocketAddress("0.0.0.0"),
container.WebSocketAPI("admin,eth,net,web3,personal,miner,istanbul"),
container.WebSocketOrigin("*"),
container.NAT("any"),
container.NoDiscover(),
container.Etherbase("1a9afb711302c5f83b5902843d1c007a1a137632"),
container.Mine(),
container.Logging(true),
)
blockchain = container.NewDefaultBlockchain(numberOfValidators)
Expect(blockchain.Start(true)).To(BeNil())
})

17
tests/general_consensus_test.go
View File

@ -36,22 +36,7 @@ var _ = Describe("TFS-01: General consensus", func() {
)
BeforeEach(func() {
blockchain = container.NewBlockchain(
numberOfValidators,
container.ImageRepository("quay.io/amis/geth"),
container.ImageTag("istanbul_develop"),
container.DataDir("/data"),
container.WebSocket(),
container.WebSocketAddress("0.0.0.0"),
container.WebSocketAPI("admin,eth,net,web3,personal,miner"),
container.WebSocketOrigin("*"),
container.NAT("any"),
container.NoDiscover(),
container.Etherbase("1a9afb711302c5f83b5902843d1c007a1a137632"),
container.Mine(),
container.Logging(false),
)
blockchain = container.NewDefaultBlockchain(numberOfValidators)
Expect(blockchain.Start(true)).To(BeNil())
})

17
tests/gossip_network_test.go
View File

@ -35,22 +35,7 @@ var _ = Describe("TFS-07: Gossip Network", func() {
)
BeforeEach(func() {
blockchain = container.NewBlockchain(
numberOfValidators,
container.ImageRepository("quay.io/amis/geth"),
container.ImageTag("istanbul_develop"),
container.DataDir("/data"),
container.WebSocket(),
container.WebSocketAddress("0.0.0.0"),
container.WebSocketAPI("admin,eth,net,web3,personal,miner"),
container.WebSocketOrigin("*"),
container.NAT("any"),
container.NoDiscover(),
container.Etherbase("1a9afb711302c5f83b5902843d1c007a1a137632"),
container.Mine(),
container.Logging(false),
)
blockchain = container.NewDefaultBlockchain(numberOfValidators)
Expect(blockchain.Start(false)).To(BeNil())
})

17
tests/integration_test.go
View File

@ -37,22 +37,7 @@ var _ = Describe("4 validators Istanbul", func() {
)
BeforeEach(func() {
blockchain = container.NewBlockchain(
numberOfValidators,
container.ImageRepository("quay.io/amis/geth"),
container.ImageTag("istanbul_develop"),
container.DataDir("/data"),
container.WebSocket(),
container.WebSocketAddress("0.0.0.0"),
container.WebSocketAPI("admin,eth,net,web3,personal,miner,istanbul"),
container.WebSocketOrigin("*"),
container.NAT("any"),
container.NoDiscover(),
container.Etherbase("1a9afb711302c5f83b5902843d1c007a1a137632"),
container.Mine(),
container.Logging(true),
)
blockchain = container.NewDefaultBlockchain(numberOfValidators)
Expect(blockchain.Start(true)).To(BeNil())
})

17
tests/non_byzantine_faulty_test.go
View File

@ -35,22 +35,7 @@ var _ = Describe("TFS-04: Non-Byzantine Faulty", func() {
)
BeforeEach(func() {
blockchain = container.NewBlockchain(
numberOfValidators,
container.ImageRepository("quay.io/amis/geth"),
container.ImageTag("istanbul_develop"),
container.DataDir("/data"),
container.WebSocket(),
container.WebSocketAddress("0.0.0.0"),
container.WebSocketAPI("admin,eth,net,web3,personal,miner"),
container.WebSocketOrigin("*"),
container.NAT("any"),
container.NoDiscover(),
container.Etherbase("1a9afb711302c5f83b5902843d1c007a1a137632"),
container.Mine(),
container.Logging(false),
)
blockchain = container.NewDefaultBlockchain(numberOfValidators)
Expect(blockchain.Start(true)).To(BeNil())
})