test: refactor new blockchain function.
This commit is contained in:
parent
dd4da1b579
commit
0f62f4a792
|
@ -53,6 +53,23 @@ func NewBlockchain(numOfValidators int, options ...Option) (bc *blockchain) {
|
||||||
return bc
|
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 {
|
type blockchain struct {
|
||||||
|
|
|
@ -35,22 +35,7 @@ var _ = Describe("Dynamic validators addition/removal testing", func() {
|
||||||
)
|
)
|
||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
blockchain = container.NewBlockchain(
|
blockchain = container.NewDefaultBlockchain(numberOfValidators)
|
||||||
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),
|
|
||||||
)
|
|
||||||
|
|
||||||
Expect(blockchain.Start(true)).To(BeNil())
|
Expect(blockchain.Start(true)).To(BeNil())
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -36,22 +36,7 @@ var _ = Describe("TFS-01: General consensus", func() {
|
||||||
)
|
)
|
||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
blockchain = container.NewBlockchain(
|
blockchain = container.NewDefaultBlockchain(numberOfValidators)
|
||||||
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),
|
|
||||||
)
|
|
||||||
|
|
||||||
Expect(blockchain.Start(true)).To(BeNil())
|
Expect(blockchain.Start(true)).To(BeNil())
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -35,22 +35,7 @@ var _ = Describe("TFS-07: Gossip Network", func() {
|
||||||
)
|
)
|
||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
blockchain = container.NewBlockchain(
|
blockchain = container.NewDefaultBlockchain(numberOfValidators)
|
||||||
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),
|
|
||||||
)
|
|
||||||
|
|
||||||
Expect(blockchain.Start(false)).To(BeNil())
|
Expect(blockchain.Start(false)).To(BeNil())
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -37,22 +37,7 @@ var _ = Describe("4 validators Istanbul", func() {
|
||||||
)
|
)
|
||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
blockchain = container.NewBlockchain(
|
blockchain = container.NewDefaultBlockchain(numberOfValidators)
|
||||||
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),
|
|
||||||
)
|
|
||||||
|
|
||||||
Expect(blockchain.Start(true)).To(BeNil())
|
Expect(blockchain.Start(true)).To(BeNil())
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -35,22 +35,7 @@ var _ = Describe("TFS-04: Non-Byzantine Faulty", func() {
|
||||||
)
|
)
|
||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
blockchain = container.NewBlockchain(
|
blockchain = container.NewDefaultBlockchain(numberOfValidators)
|
||||||
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),
|
|
||||||
)
|
|
||||||
|
|
||||||
Expect(blockchain.Start(true)).To(BeNil())
|
Expect(blockchain.Start(true)).To(BeNil())
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue