refactor(cli): moved types accordingly

cli/.mockery.yaml

@@ -4,7 +4,7 @@ dir: 'mocks/mock{{.PackageName}}'
 mockname: '{{.InterfaceName}}'
 outpkg: 'mock{{.PackageName}}'
 packages:
-  github.com/deepsquare-io/grid/cli/types:
+  github.com/deepsquare-io/grid/cli/types/job:
     interfaces:
-      MetaScheduledJobsIdsFetcher:
-      JobFetcher:
+      MetaScheduledIdsFetcher:
+      Fetcher:

cli/cmd/job/job.go

@@ -47,6 +47,7 @@ import (
 	"github.com/deepsquare-io/grid/cli/internal/utils"
 	"github.com/deepsquare-io/grid/cli/metascheduler"
 	"github.com/deepsquare-io/grid/cli/types"
+	"github.com/deepsquare-io/grid/cli/types/event"
 	"github.com/erikgeiser/promptkit/confirmation"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
@@ -263,7 +264,7 @@ var Command = cli.Command{
 				transitions := make(chan types.JobTransition, 1)
 				sub, err := watcher.SubscribeEvents(
 					ctx,
-					types.FilterJobTransition(transitions),
+					event.FilterJobTransition(transitions),
 				)
 				if err != nil {
 					return err

cli/cmd/provider/provider.go

@@ -38,7 +38,7 @@ import (
 	"github.com/deepsquare-io/grid/cli/deepsquare"
 	"github.com/deepsquare-io/grid/cli/internal/utils"
 	"github.com/deepsquare-io/grid/cli/metascheduler"
-	"github.com/deepsquare-io/grid/cli/types"
+	"github.com/deepsquare-io/grid/cli/types/provider"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -128,9 +128,9 @@ var Command = cli.Command{
 					MetaschedulerAddress: common.HexToAddress(metaschedulerSmartContract),
 					ChainID:              chainID,
 				})
-				opts := make([]types.GetProviderOption, 0)
+				opts := make([]provider.GetProviderOption, 0)
 				if proposal {
-					opts = append(opts, types.WithProposal())
+					opts = append(opts, provider.WithProposal())
 				}
 				providers, err := clientset.ProviderManager().GetProviders(ctx, opts...)
 				if err != nil {
@@ -155,7 +155,7 @@ var Command = cli.Command{
 					return err
 				}
 				providerAddress := common.HexToAddress(cCtx.Args().First())
-				return clientset.ProviderManager().Approve(cCtx.Context, providerAddress)
+				return clientset.ProviderManager().ApproveProvider(cCtx.Context, providerAddress)
 			},
 		},
 		{
@@ -169,7 +169,7 @@ var Command = cli.Command{
 					return err
 				}
 				providerAddress := common.HexToAddress(cCtx.Args().First())
-				return clientset.ProviderManager().Remove(cCtx.Context, providerAddress)
+				return clientset.ProviderManager().RemoveProvider(cCtx.Context, providerAddress)
 			},
 		},
 	},

cli/cmd/submit/submit.go

@@ -89,6 +89,9 @@ import (
 	"github.com/deepsquare-io/grid/cli/sbatch"
 	"github.com/deepsquare-io/grid/cli/types"
 	metaschedulerabi "github.com/deepsquare-io/grid/cli/types/abi/metascheduler"
+	"github.com/deepsquare-io/grid/cli/types/event"
+	"github.com/deepsquare-io/grid/cli/types/job"
+	"github.com/deepsquare-io/grid/cli/types/provider"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/urfave/cli/v2"
@@ -326,8 +329,8 @@ var Command = cli.Command{
 		if err != nil {
 			return err
 		}
-		var job sbatch.Job
-		if err := yaml.Unmarshal(dat, &job); err != nil {
+		var j sbatch.Job
+		if err := yaml.Unmarshal(dat, &j); err != nil {
 			return err
 		}
 
@@ -389,11 +392,11 @@ var Command = cli.Command{
 		if !watch {
 			jobID, err := client.SubmitJob(
 				ctx,
-				&job,
+				&j,
 				credits,
 				jobNameB,
-				types.WithUse(usesLabels...),
-				types.WithAffinity(affinities...),
+				job.WithUse(usesLabels...),
+				job.WithAffinity(affinities...),
 			)
 			if err != nil {
 				return err
@@ -406,13 +409,13 @@ var Command = cli.Command{
 
 		// Watch submit logic
 		transitions := make(chan types.JobTransition, 1)
-		sub, err := watcher.SubscribeEvents(ctx, types.FilterJobTransition(transitions))
+		sub, err := watcher.SubscribeEvents(ctx, event.FilterJobTransition(transitions))
 		if err != nil {
 			return err
 		}
 		defer sub.Unsubscribe()
 
-		jobID, err := client.SubmitJob(ctx, &job, credits, jobNameB, types.WithUse(usesLabels...))
+		jobID, err := client.SubmitJob(ctx, &j, credits, jobNameB, job.WithUse(usesLabels...))
 		if err != nil {
 			return err
 		}
@@ -422,7 +425,7 @@ var Command = cli.Command{
 		fmt.Printf("---Waiting for job %s to be running...---\n", jobIDBig.String())
 		var finished = false
 		var allocatedProviderAddress common.Address
-		var provider types.ProviderDetail
+		var provider provider.Detail
 		msOrSchedLen, runningLen := int64(0), int64(0)
 		// Wait for finished or running
 	loop:
@@ -587,7 +590,7 @@ var forbiddenReplacer = strings.NewReplacer(
 // computeWaitingTime returns min(running) + sum(waiting)
 func computeWaitingTime(
 	jobID [32]byte,
-	provider types.ProviderDetail,
+	provider provider.Detail,
 	jobs []types.Job,
 ) (time.Duration, error) {
 	var waiting, running time.Duration

cli/deepsquare/deepsquare_client.go

@@ -20,6 +20,7 @@ import (
 	"crypto/ecdsa"
 	"crypto/tls"
 	"crypto/x509"
+	"math/big"
 	"net"
 	"net/http"
 	"net/url"
@@ -30,6 +31,11 @@ import (
 	"github.com/deepsquare-io/grid/cli/metascheduler"
 	"github.com/deepsquare-io/grid/cli/sbatch"
 	"github.com/deepsquare-io/grid/cli/types"
+	"github.com/deepsquare-io/grid/cli/types/allowance"
+	"github.com/deepsquare-io/grid/cli/types/credit"
+	"github.com/deepsquare-io/grid/cli/types/event"
+	"github.com/deepsquare-io/grid/cli/types/job"
+	"github.com/deepsquare-io/grid/cli/types/provider"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -51,12 +57,12 @@ const (
 // Users must call Close() at the end of the application to avoid pending connections.
 type Client interface {
 	types.Logger
-	types.JobScheduler
-	types.JobFetcher
-	types.JobsByProviderFetcher
-	types.CreditManager
-	types.AllowanceManager
-	types.ProviderManager
+	job.Scheduler
+	job.Fetcher
+	job.ByProviderFetcher
+	credit.Manager
+	allowance.Manager
+	provider.Manager
 	// Close all connections.
 	Close() error
 }
@@ -118,14 +124,87 @@ func (c *ClientConfig) applyDefault() {
 
 type client struct {
 	types.Logger
-	types.JobScheduler
-	types.JobFetcher
-	types.JobsByProviderFetcher
-	types.CreditManager
-	types.AllowanceManager
-	types.ProviderManager
-	loggerConn *grpc.ClientConn
-	rpcClient  *rpc.Client
+	job.Scheduler
+	job.Fetcher
+	job.ByProviderFetcher
+	CreditManager    credit.Manager
+	AllowanceManager allowance.Manager
+	ProviderManager  provider.Manager
+	loggerConn       *grpc.ClientConn
+	rpcClient        *rpc.Client
+}
+
+// GetProvider implements Client.
+func (c *client) GetProvider(
+	ctx context.Context,
+	address common.Address,
+	opts ...provider.GetProviderOption,
+) (provider provider.Detail, err error) {
+	return c.ProviderManager.GetProvider(ctx, address, opts...)
+}
+
+// GetProviders implements Client.
+func (c *client) GetProviders(
+	ctx context.Context,
+	opts ...provider.GetProviderOption,
+) (providers []provider.Detail, err error) {
+	return c.ProviderManager.GetProviders(ctx, opts...)
+}
+
+// Approve implements Client.
+func (c *client) ApproveProvider(ctx context.Context, provider common.Address) error {
+	return c.ProviderManager.ApproveProvider(ctx, provider)
+}
+
+// Balance implements Client.
+func (c *client) Balance(ctx context.Context) (*big.Int, error) {
+	return c.CreditManager.Balance(ctx)
+}
+
+// BalanceOf implements Client.
+func (c *client) BalanceOf(ctx context.Context, address common.Address) (*big.Int, error) {
+	return c.CreditManager.BalanceOf(ctx, address)
+}
+
+// ClearAllowance implements Client.
+func (c *client) ClearAllowance(ctx context.Context) error {
+	return c.AllowanceManager.ClearAllowance(ctx)
+}
+
+// GetAllowance implements Client.
+func (c *client) GetAllowance(ctx context.Context) (*big.Int, error) {
+	return c.AllowanceManager.GetAllowance(ctx)
+}
+
+// ReduceToAllowance implements Client.
+func (c *client) ReduceToAllowance(
+	ctx context.Context,
+	approvals <-chan types.Approval,
+) (<-chan *big.Int, error) {
+	return c.AllowanceManager.ReduceToAllowance(ctx, approvals)
+}
+
+// ReduceToBalance implements Client.
+func (c *client) ReduceToBalance(
+	ctx context.Context,
+	transfers <-chan types.Transfer,
+) (<-chan *big.Int, error) {
+	return c.CreditManager.ReduceToBalance(ctx, transfers)
+}
+
+// RemoveProvider implements Client.
+func (c *client) RemoveProvider(ctx context.Context, provider common.Address) error {
+	return c.ProviderManager.RemoveProvider(ctx, provider)
+}
+
+// SetAllowance implements Client.
+func (c *client) SetAllowance(ctx context.Context, amount *big.Int) error {
+	return c.AllowanceManager.SetAllowance(ctx, amount)
+}
+
+// Transfer implements Client.
+func (c *client) Transfer(ctx context.Context, to common.Address, amount *big.Int) error {
+	return c.CreditManager.Transfer(ctx, to, amount)
 }
 
 // NewClient creates a new Client for the given ClientConfig.
@@ -185,15 +264,15 @@ func NewClient(ctx context.Context, c *ClientConfig) (Client, error) {
 	fetcher := rpcClientSet.JobFetcher()
 	runningJobsByProviderFetcher := metascheduler.NewJobsByProviderFetcher(oracle, fetcher)
 	return &client{
-		JobFetcher:            fetcher,
-		JobScheduler:          jobScheduler,
-		JobsByProviderFetcher: runningJobsByProviderFetcher,
-		CreditManager:         rpcClientSet.CreditManager(),
-		AllowanceManager:      rpcClientSet.AllowanceManager(),
-		ProviderManager:       rpcClientSet.ProviderManager(),
-		Logger:                logger,
-		loggerConn:            conn,
-		rpcClient:             rpcClient,
+		Fetcher:           fetcher,
+		Scheduler:         jobScheduler,
+		ByProviderFetcher: runningJobsByProviderFetcher,
+		CreditManager:     rpcClientSet.CreditManager(),
+		AllowanceManager:  rpcClientSet.AllowanceManager(),
+		ProviderManager:   rpcClientSet.ProviderManager(),
+		Logger:            logger,
+		loggerConn:        conn,
+		rpcClient:         rpcClient,
 	}, nil
 }
 
@@ -206,7 +285,7 @@ func (c *client) Close() error {
 //
 // Users must call Close() at the end of the application to avoid pending connections.
 type Watcher interface {
-	types.EventSubscriber
+	event.Subscriber
 	// Close all connections.
 	Close() error
 }
@@ -248,7 +327,7 @@ func (c *WatcherConfig) applyDefault() {
 }
 
 type watcher struct {
-	types.EventSubscriber
+	event.Subscriber
 	rpcClient *rpc.Client
 	wsClient  *rpc.Client
 }
@@ -283,9 +362,9 @@ func NewWatcher(ctx context.Context, c *WatcherConfig) (Watcher, error) {
 		UserPrivateKey:       c.UserPrivateKey,
 	}
 	return &watcher{
-		EventSubscriber: metascheduler.NewEventSubscriber(metaschedulerRPC, metaschedulerWS),
-		rpcClient:       rpcClient,
-		wsClient:        wsClient,
+		Subscriber: metascheduler.NewEventSubscriber(metaschedulerRPC, metaschedulerWS),
+		rpcClient:  rpcClient,
+		wsClient:   wsClient,
 	}, nil
 }
 

cli/metascheduler/metascheduler_jobfetcher.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/deepsquare-io/grid/cli/types"
 	metaschedulerabi "github.com/deepsquare-io/grid/cli/types/abi/metascheduler"
+	"github.com/deepsquare-io/grid/cli/types/job"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 )
 
@@ -40,7 +41,7 @@ func (c *jobFetcher) GetJob(ctx context.Context, id [32]byte) (types.Job, error)
 }
 
 type jobIterator struct {
-	types.JobFetcher
+	job.Fetcher
 	array  [][32]byte
 	length int
 	index  int
@@ -92,7 +93,7 @@ func (it *jobIterator) Error() error {
 	return it.err
 }
 
-func (c *jobFetcher) GetJobs(ctx context.Context) (types.JobLazyIterator, error) {
+func (c *jobFetcher) GetJobs(ctx context.Context) (job.LazyIterator, error) {
 	jobIDs, err := c.GetByCustomer(&bind.CallOpts{
 		Context: ctx,
 	}, c.from())
@@ -104,10 +105,10 @@ func (c *jobFetcher) GetJobs(ctx context.Context) (types.JobLazyIterator, error)
 		jobIDs[i], jobIDs[j] = jobIDs[j], jobIDs[i]
 	}
 	return &jobIterator{
-		JobFetcher: c,
-		array:      jobIDs,
-		length:     len(jobIDs),
-		index:      -1,
-		job:        nil,
+		Fetcher: c,
+		array:   jobIDs,
+		length:  len(jobIDs),
+		index:   -1,
+		job:     nil,
 	}, nil
 }