container, tests/*: add NodeIncubator interface

container/blockchain.go

@@ -44,6 +44,10 @@ const (
 	defaultPassword  = ""
 )
 
+type NodeIncubator interface {
+	CreateNodes(int, ...Option) ([]Ethereum, error)
+}
+
 type Blockchain interface {
 	AddValidators(numOfValidators int) ([]Ethereum, error)
 	RemoveValidators(candidates []Ethereum, t time.Duration) error
@@ -52,7 +56,6 @@ type Blockchain interface {
 	Stop(bool) error
 	Validators() []Ethereum
 	Finalize()
-	CreateNodes(int, ...Option) ([]Ethereum, error)
 }
 
 func NewBlockchain(network *DockerNetwork, numOfValidators int, options ...Option) (bc *blockchain) {

tests/functional/block_sync_test.go

@@ -52,7 +52,11 @@ var _ = Describe("Block synchronization testing", func() {
 
 		BeforeEach(func() {
 			var err error
-			nodes, err = blockchain.CreateNodes(numberOfNodes,
+
+			incubator, ok := blockchain.(container.NodeIncubator)
+			Expect(ok).To(BeTrue())
+
+			nodes, err = incubator.CreateNodes(numberOfNodes,
 				container.ImageRepository("quay.io/amis/geth"),
 				container.ImageTag("istanbul_develop"),
 				container.DataDir("/data"),

tests/quorum/functional/block_sync_test.go

@@ -57,7 +57,11 @@ var _ = Describe("Block synchronization testing", func() {
 
 		BeforeEach(func() {
 			var err error
-			nodes, err = blockchain.CreateNodes(numberOfNodes,
+
+			incubator, ok := blockchain.(container.NodeIncubator)
+			Expect(ok).To(BeTrue())
+
+			nodes, err = incubator.CreateNodes(numberOfNodes,
 				container.ImageRepository("quay.io/amis/geth"),
 				container.ImageTag("istanbul_develop"),
 				container.DataDir("/data"),