internal/libhive: inventory refactoring

clients/lighthouse-bn/hive.yaml

@@ -1,5 +1,2 @@
 roles:
   - beacon
-build_targets:
-  - mainnet
-  - minimal

clients/lodestar-bn/hive.yaml

@@ -1,4 +1,3 @@
 roles:
   - beacon
-build_targets:
-  - mainnet
+

clients/nimbus-bn/hive.yaml

@@ -1,4 +1,2 @@
 roles:
   - beacon
-build_targets:
-  - mainnet

clients/prysm-bn/hive.yaml

@@ -1,5 +1,2 @@
 roles:
   - beacon
-build_targets:
-  - mainnet
-  - minimal

internal/fakes/builder.go

@@ -12,7 +12,6 @@ type BuilderHooks struct {
 	BuildClientImage    func(context.Context, libhive.ClientDesignator) (string, error)
 	BuildSimulatorImage func(context.Context, string) (string, error)
 	ReadFile            func(ctx context.Context, image string, file string) ([]byte, error)
-	ReadClientMetadata  func(client libhive.ClientDesignator) (*libhive.ClientMetadata, error)
 }
 
 // fakeBuilder implements Backend without docker.
@@ -47,14 +46,6 @@ func (b *fakeBuilder) BuildImage(ctx context.Context, name string, fsys fs.FS) e
 	return nil
 }
 
-func (b *fakeBuilder) ReadClientMetadata(client libhive.ClientDesignator) (*libhive.ClientMetadata, error) {
-	if b.hooks.ReadClientMetadata != nil {
-		return b.hooks.ReadClientMetadata(client)
-	}
-	m := libhive.ClientMetadata{Roles: []string{"eth1"}}
-	return &m, nil
-}
-
 func (b *fakeBuilder) ReadFile(ctx context.Context, image, file string) ([]byte, error) {
 	if b.hooks.ReadFile != nil {
 		return b.hooks.ReadFile(ctx, image, file)

internal/libdocker/builder.go

@@ -13,7 +13,6 @@ import (
 
 	docker "github.com/fsouza/go-dockerclient"
 	"gopkg.in/inconshreveable/log15.v2"
-	"gopkg.in/yaml.v3"
 
 	"github.com/ethereum/hive/internal/libhive"
 )
@@ -39,26 +38,6 @@ func NewBuilder(client *docker.Client, cfg *Config, auth Authenticator) *Builder
 	return b
 }
 
-// ReadClientMetadata reads metadata of the given client.
-func (b *Builder) ReadClientMetadata(client libhive.ClientDesignator) (*libhive.ClientMetadata, error) {
-	dir := b.config.Inventory.ClientDirectory(client)
-	f, err := os.Open(filepath.Join(dir, "hive.yaml"))
-	if err != nil {
-		if os.IsNotExist(err) {
-			// Eth1 client by default.
-			return &libhive.ClientMetadata{Roles: []string{"eth1"}}, nil
-		} else {
-			return nil, fmt.Errorf("failed to read hive metadata file in '%s': %v", dir, err)
-		}
-	}
-	defer f.Close()
-	var out libhive.ClientMetadata
-	if err := yaml.NewDecoder(f).Decode(&out); err != nil {
-		return nil, fmt.Errorf("failed to decode hive metadata file in '%s': %v", dir, err)
-	}
-	return &out, nil
-}
-
 // BuildClientImage builds a docker image of the given client.
 func (b *Builder) BuildClientImage(ctx context.Context, client libhive.ClientDesignator) (string, error) {
 	dir := b.config.Inventory.ClientDirectory(client)

internal/libhive/dockerface.go

@@ -80,7 +80,6 @@ type ContainerInfo struct {
 
 // Builder can build docker images of clients and simulators.
 type Builder interface {
-	ReadClientMetadata(client ClientDesignator) (*ClientMetadata, error)
 	BuildClientImage(ctx context.Context, client ClientDesignator) (string, error)
 	BuildSimulatorImage(ctx context.Context, name string) (string, error)
 	BuildImage(ctx context.Context, name string, fsys fs.FS) error