Embed Client

Embed AssetsClient in Assets.Client
Embed PublicAssetsClient in PublicAssets.Client

AB#9875

Author: eccles

datatrails-common-api/assets/v2/assets/client.go

@@ -7,8 +7,8 @@ import (
 type ClientOption = grpcclient.ClientOption
 
 type Client struct {
+        AssetsClient
         g      *grpcclient.Client
-        Client AssetsClient
 }
 
 func NewClient(log Logger, address string, opts ...ClientOption) *Client {
@@ -18,14 +18,14 @@ func NewClient(log Logger, address string, opts ...ClientOption) *Client {
 }
 
 func (c *Client) Open() error {
-        if c.Client != nil {
+        if c.AssetsClient != nil {
                 return nil
         }
         err := c.g.Open()
         if err != nil {
                 return err
         }
-        c.Client = NewAssetsClient(c.g.Connector())
+        c.AssetsClient = NewAssetsClient(c.g.Connector())
         return nil
 }
 

datatrails-common-api/assets/v2/assets/publicclient.go

@@ -5,8 +5,8 @@ import (
 )
 
 type PublicClient struct {
+        PublicAssetsClient
         g      *grpcclient.Client
-        Client PublicAssetsClient
 }
 
 func NewPublicClient(log Logger, address string, opts ...ClientOption) *PublicClient {
@@ -16,14 +16,14 @@ func NewPublicClient(log Logger, address string, opts ...ClientOption) *PublicCl
 }
 
 func (c *PublicClient) Open() error {
-        if c.Client != nil {
+        if c.PublicAssetsClient != nil {
                 return nil
         }
         err := c.g.Open()
         if err != nil {
                 return err
         }
-        c.Client = NewPublicAssetsClient(c.g.Connector())
+        c.PublicAssetsClient = NewPublicAssetsClient(c.g.Connector())
         return nil
 }