From 0f62f4a79242c039b3d06c8265f6ed46eb3a810e Mon Sep 17 00:00:00 2001 From: Yute Lin Date: Wed, 23 Aug 2017 13:59:37 +0800 Subject: [PATCH] test: refactor new blockchain function. --- container/blockchain.go | 17 +++++++++++++++++ tests/dynamic_test.go | 17 +---------------- tests/general_consensus_test.go | 17 +---------------- tests/gossip_network_test.go | 17 +---------------- tests/integration_test.go | 17 +---------------- tests/non_byzantine_faulty_test.go | 17 +---------------- 6 files changed, 22 insertions(+), 80 deletions(-) diff --git a/container/blockchain.go b/container/blockchain.go index 8cc76d10..f750caaa 100644 --- a/container/blockchain.go +++ b/container/blockchain.go @@ -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 { diff --git a/tests/dynamic_test.go b/tests/dynamic_test.go index bf9ca59b..ce8b0fa6 100644 --- a/tests/dynamic_test.go +++ b/tests/dynamic_test.go @@ -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()) }) diff --git a/tests/general_consensus_test.go b/tests/general_consensus_test.go index 082d9d07..819c119a 100644 --- a/tests/general_consensus_test.go +++ b/tests/general_consensus_test.go @@ -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()) }) diff --git a/tests/gossip_network_test.go b/tests/gossip_network_test.go index dbef4dfe..a4a6d962 100644 --- a/tests/gossip_network_test.go +++ b/tests/gossip_network_test.go @@ -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()) }) diff --git a/tests/integration_test.go b/tests/integration_test.go index eac39f93..bc67d074 100644 --- a/tests/integration_test.go +++ b/tests/integration_test.go @@ -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()) }) diff --git a/tests/non_byzantine_faulty_test.go b/tests/non_byzantine_faulty_test.go index d78c1601..d0d3ed5d 100644 --- a/tests/non_byzantine_faulty_test.go +++ b/tests/non_byzantine_faulty_test.go @@ -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()) })