remove database docker interface and cmd

Author: colinlyguo

common/docker/docker_geth.go

@@ -55,7 +55,7 @@ func NewImgGeth(t *testing.T, image, volume, ipc string, hPort, wPort int) ImgIn
 
 // Start run image and check if it is running healthily.
 func (i *ImgGeth) Start() error {
-	id := getContainerID(i.name)
+	id := GetContainerID(i.name)
 	if id != "" {
 		return fmt.Errorf("container already exist, name: %s", i.name)
 	}
@@ -99,7 +99,7 @@ func (i *ImgGeth) isOk() bool {
 
 	select {
 	case <-okCh:
-		i.id = getContainerID(i.name)
+		i.id = GetContainerID(i.name)
 		return i.id != ""
 	case <-time.NewTimer(time.Second * 10).C:
 		return false
@@ -115,7 +115,7 @@ func (i *ImgGeth) Stop() error {
 
 	ctx := context.Background()
 	// check if container is running, stop the running container.
-	id := getContainerID(i.name)
+	id := GetContainerID(i.name)
 	if id != "" {
 		timeout := time.Second * 3
 		if err := cli.ContainerStop(ctx, id, &timeout); err != nil {

common/docker/interface.go

@@ -7,14 +7,15 @@ import (
 	"github.com/docker/docker/api/types/filters"
 )
 
-// ImgInstance is the geth img instance.
+// ImgInstance is an img instance.
 type ImgInstance interface {
 	Start() error
 	Stop() error
 	Endpoint() string
 }
 
-func getContainerID(name string) string {
+// GetContainerID returns the ID of Container.
+func GetContainerID(name string) string {
 	filter := filters.NewArgs()
 	filter.Add("name", name)
 	lst, _ := cli.ContainerList(context.Background(), types.ContainerListOptions{

coordinator/README.md

@@ -38,5 +38,5 @@ export TEST_DB_DSN="postgres://admin:123456@localhost/test_db?sslmode=disable"
 * use specified ports and config.json
 
 ```bash
-./build/bin/coordinator --config ./config.json --http --http.addr localhost --http.port 8290
+./build/bin/coordinator --config ./config.json --http --http.addr localhost --http.port 8390
 ```

coordinator/api.go

@@ -1,4 +1,4 @@
-package rollers
+package coordinator
 
 import (
 	"fmt"

coordinator/conns.go

@@ -1,4 +1,4 @@
-package rollers
+package coordinator
 
 import (
 	cmap "github.com/orcaman/concurrent-map"

coordinator/manager.go

@@ -1,4 +1,4 @@
-package rollers
+package coordinator
 
 import (
 	"context"

coordinator/server.go

@@ -1,4 +1,4 @@
-package rollers
+package coordinator
 
 import (
 	"context"

database/docker/cmd.go

@@ -9,6 +9,8 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
+
+	"scroll-tech/common/docker"
 )
 
 var (
@@ -35,24 +37,24 @@ type ImgDB struct {
 	password string
 
 	running bool
-	*Cmd
+	*docker.Cmd
 }
 
 // NewImgDB return postgres db img instance.
-func NewImgDB(t *testing.T, image, password, dbName string, port int) ImgInstance {
+func NewImgDB(t *testing.T, image, password, dbName string, port int) docker.ImgInstance {
 	return &ImgDB{
 		image:    image,
 		name:     fmt.Sprintf("%s-%s_%d", image, dbName, port),
 		password: password,
 		dbName:   dbName,
 		port:     port,
-		Cmd:      NewCmd(t),
+		Cmd:      docker.NewCmd(t),
 	}
 }
 
 // Start postgres db container.
 func (i *ImgDB) Start() error {
-	id := getContainerID(i.name)
+	id := docker.GetContainerID(i.name)
 	if id != "" {
 		return fmt.Errorf("container already exist, name: %s", i.name)
 	}
@@ -74,7 +76,7 @@ func (i *ImgDB) Stop() error {
 
 	ctx := context.Background()
 	// check if container is running, stop the running container.
-	id := getContainerID(i.name)
+	id := docker.GetContainerID(i.name)
 	if id != "" {
 		timeout := time.Second * 3
 		if err := cli.ContainerStop(ctx, id, &timeout); err != nil {
@@ -122,7 +124,7 @@ func (i *ImgDB) isOk() bool {
 	select {
 	case <-okCh:
 		time.Sleep(time.Millisecond * 1500)
-		i.id = getContainerID(i.name)
+		i.id = docker.GetContainerID(i.name)
 		return i.id != ""
 	case <-time.NewTimer(time.Second * 10).C:
 		return false