feat: return order IDs after price prediction (#1682)

optimus/engine.go

@@ -354,8 +354,6 @@ func (m *workerEngine) execute(ctx context.Context) error {
 		// Extract the order ID for whose the selling plan is created.
 		orderID := plan.GetOrderID()
 
-		// Then we need to clean this, because otherwise worker rejects such request.
-		plan.OrderID = nil
 		plan.Identity = m.cfg.Identity
 		plan.Tag = m.tagger.Tag()
 

optimus/optimus.go

@@ -91,7 +91,8 @@ func (m *Optimus) Run(ctx context.Context) error {
 		}
 
 		// TODO: Well, 10 parameters seems to be WAT.
-		control, err := newWorkerEngine(cfg, ethAddr, masterAddr, blacklist, worker, market.Market(), marketCache, benchmarkMapping, newTagger(m.version), m.log)
+		workerClient := &workerManagementClientAPI{worker}
+		control, err := newWorkerEngine(cfg, ethAddr, masterAddr, blacklist, workerClient, market.Market(), marketCache, benchmarkMapping, newTagger(m.version), m.log)
 		if err != nil {
 			return err
 		}

optimus/predictor_service.go

@@ -71,5 +71,13 @@ func (m *PredictorService) PredictSupplier(ctx context.Context, request *sonm.Pr
 		return nil, err
 	}
 
-	return &sonm.PredictSupplierReply{Price: sonm.SumPrice(worker.Result)}, nil
+	orderIDs := make([]*sonm.BigInt, 0, len(worker.Result))
+	for _, plan := range worker.Result {
+		orderIDs = append(orderIDs, plan.GetOrderID())
+	}
+
+	return &sonm.PredictSupplierReply{
+		Price:    sonm.SumPrice(worker.Result),
+		OrderIDs: orderIDs,
+	}, nil
 }

optimus/worker.go

@@ -68,6 +68,17 @@ type WorkerManagementClientAPI interface {
 	NextMaintenance(ctx context.Context, request *sonm.Empty, opts ...grpc.CallOption) (*sonm.Timestamp, error)
 }
 
+type workerManagementClientAPI struct {
+	WorkerManagementClientAPI
+}
+
+func (m *workerManagementClientAPI) CreateAskPlan(ctx context.Context, request *sonm.AskPlan, opts ...grpc.CallOption) (*sonm.ID, error) {
+	// We need to clean this, because otherwise worker rejects such request.
+	request.OrderID = nil
+
+	return m.WorkerManagementClientAPI.CreateAskPlan(ctx, request, opts...)
+}
+
 // WorkerManagementClientExt extends default "WorkerManagementClient" with an
 // ability to remove multiple ask-plans.
 type WorkerManagementClientExt interface {

proto/optimus.proto

@@ -1,5 +1,6 @@
 syntax = "proto3";
 
+import "bigint.proto";
 import "insonmnia.proto";
 import "marketplace.proto";
 import "worker.proto";
@@ -17,4 +18,5 @@ message PredictSupplierRequest {
 
 message PredictSupplierReply {
     Price price = 1;
+    repeated BigInt orderIDs = 2;
 }