Re-work batch logic for simplicity, efficiency, and restart recovery

docs/swagger/swagger.yaml

@@ -1087,6 +1087,7 @@ paths:
                               enum:
                               - staged
                               - ready
+                              - sent
                               - pending
                               - confirmed
                               - rejected
@@ -1239,6 +1240,7 @@ paths:
                               enum:
                               - staged
                               - ready
+                              - sent
                               - pending
                               - confirmed
                               - rejected
@@ -3479,6 +3481,7 @@ paths:
                     enum:
                     - staged
                     - ready
+                    - sent
                     - pending
                     - confirmed
                     - rejected
@@ -4294,6 +4297,7 @@ paths:
                     enum:
                     - staged
                     - ready
+                    - sent
                     - pending
                     - confirmed
                     - rejected
@@ -4402,6 +4406,7 @@ paths:
                     enum:
                     - staged
                     - ready
+                    - sent
                     - pending
                     - confirmed
                     - rejected
@@ -4705,6 +4710,7 @@ paths:
                   type:
                     enum:
                     - none
+                    - unpinned
                     - batch_pin
                     - token_pool
                     - token_transfer
@@ -4839,6 +4845,7 @@ paths:
                     enum:
                     - staged
                     - ready
+                    - sent
                     - pending
                     - confirmed
                     - rejected
@@ -4899,6 +4906,7 @@ paths:
                     enum:
                     - staged
                     - ready
+                    - sent
                     - pending
                     - confirmed
                     - rejected
@@ -5046,6 +5054,7 @@ paths:
                     enum:
                     - staged
                     - ready
+                    - sent
                     - pending
                     - confirmed
                     - rejected
@@ -5106,6 +5115,7 @@ paths:
                     enum:
                     - staged
                     - ready
+                    - sent
                     - pending
                     - confirmed
                     - rejected
@@ -5263,6 +5273,7 @@ paths:
                     enum:
                     - staged
                     - ready
+                    - sent
                     - pending
                     - confirmed
                     - rejected
@@ -6487,6 +6498,7 @@ paths:
                       enum:
                       - staged
                       - ready
+                      - sent
                       - pending
                       - confirmed
                       - rejected
@@ -6741,6 +6753,7 @@ paths:
                       enum:
                       - staged
                       - ready
+                      - sent
                       - pending
                       - confirmed
                       - rejected
@@ -7524,6 +7537,7 @@ paths:
                       enum:
                       - staged
                       - ready
+                      - sent
                       - pending
                       - confirmed
                       - rejected
@@ -7807,6 +7821,7 @@ paths:
                   type:
                     enum:
                     - none
+                    - unpinned
                     - batch_pin
                     - token_pool
                     - token_transfer
@@ -7917,6 +7932,7 @@ paths:
                   type:
                     enum:
                     - none
+                    - unpinned
                     - batch_pin
                     - token_pool
                     - token_transfer
@@ -8681,5 +8697,64 @@ paths:
           description: Success
         default:
           description: ""
+  /status/batchmanager:
+    get:
+      description: 'TODO: Description'
+      operationId: getStatusBatchManager
+      parameters:
+      - description: Server-side request timeout (millseconds, or set a custom suffix
+          like 10s)
+        in: header
+        name: Request-Timeout
+        schema:
+          default: 120s
+          type: string
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                properties:
+                  processors:
+                    items:
+                      properties:
+                        dispatcher:
+                          type: string
+                        name:
+                          type: string
+                        status:
+                          properties:
+                            averageBatchBytes:
+                              format: int64
+                              type: integer
+                            averageBatchData:
+                              format: double
+                              type: number
+                            averageBatchMessages:
+                              format: double
+                              type: number
+                            averageFlushTimeMS:
+                              format: int64
+                              type: integer
+                            blocked:
+                              type: boolean
+                            flushing: {}
+                            lastFlushError:
+                              type: string
+                            lastFlushErrorTime: {}
+                            lastFlushStartTime: {}
+                            totalBatches:
+                              format: int64
+                              type: integer
+                            totalErrors:
+                              format: int64
+                              type: integer
+                          type: object
+                      type: object
+                    type: array
+                type: object
+          description: Success
+        default:
+          description: ""
 servers:
 - url: http://localhost:12345

internal/apiserver/route_get_status_batchmanager.go

@@ -0,0 +1,42 @@
+// Copyright © 2022 Kaleido, Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package apiserver
+
+import (
+	"net/http"
+
+	"github.com/hyperledger/firefly/internal/batch"
+	"github.com/hyperledger/firefly/internal/i18n"
+	"github.com/hyperledger/firefly/internal/oapispec"
+)
+
+var getStatusBatchManager = &oapispec.Route{
+	Name:            "getStatusBatchManager",
+	Path:            "status/batchmanager",
+	Method:          http.MethodGet,
+	PathParams:      nil,
+	QueryParams:     nil,
+	FilterFactory:   nil,
+	Description:     i18n.MsgTBD,
+	JSONInputValue:  nil,
+	JSONOutputValue: func() interface{} { return &batch.ManagerStatus{} },
+	JSONOutputCodes: []int{http.StatusOK},
+	JSONHandler: func(r *oapispec.APIRequest) (output interface{}, err error) {
+		output = getOr(r.Ctx).BatchManager().Status()
+		return output, nil
+	},
+}

internal/apiserver/route_get_status_batchmanager_test.go

@@ -0,0 +1,42 @@
+// Copyright © 2021 Kaleido, Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package apiserver
+
+import (
+	"net/http/httptest"
+	"testing"
+
+	"github.com/hyperledger/firefly/internal/batch"
+	"github.com/hyperledger/firefly/mocks/batchmocks"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+)
+
+func TestGetStatusBatching(t *testing.T) {
+	o, r := newTestAPIServer()
+	req := httptest.NewRequest("GET", "/api/v1/status/batchmanager", nil)
+	req.Header.Set("Content-Type", "application/json; charset=utf-8")
+	res := httptest.NewRecorder()
+
+	mbm := &batchmocks.Manager{}
+	o.On("BatchManager").Return(mbm)
+	mbm.On("Status", mock.Anything, mock.Anything).
+		Return(&batch.ManagerStatus{}, nil)
+	r.ServeHTTP(res, req)
+
+	assert.Equal(t, 200, res.Result().StatusCode)
+}

internal/apiserver/routes.go

@@ -64,6 +64,7 @@ var routes = []*oapispec.Route{
 	getOpByID,
 	getOps,
 	getStatus,
+	getStatusBatchManager,
 	getSubscriptionByID,
 	getSubscriptions,
 	getTxnByID,