Merge pull request #58 from kaleido-io/txstatus-input

Suggestions on TODOs and comments/naming for TX History API

.vscode/settings.json

@@ -84,6 +84,7 @@
     "Tracef",
     "txcommon",
     "txcommonmocks",
+    "txhistory",
     "txid",
     "txns",
     "txtype",

Makefile

@@ -33,6 +33,7 @@ endef
 
 $(eval $(call makemock, pkg/ffcapi,             API,                    ffcapimocks))
 $(eval $(call makemock, pkg/policyengine,       PolicyEngine,           policyenginemocks))
+$(eval $(call makemock, pkg/txhistory,          Manager,                txhistorymocks))
 $(eval $(call makemock, internal/confirmations, Manager,                confirmationsmocks))
 $(eval $(call makemock, internal/persistence,   Persistence,            persistencemocks))
 $(eval $(call makemock, internal/ws,            WebSocketChannels,      wsmocks))

config.md

@@ -241,9 +241,7 @@
 
 |Key|Description|Type|Default Value|
 |---|-----------|----|-------------|
-|maxHistoryActions|The number of actions to store per historical status updates|`int`|`50`
 |maxHistoryCount|The number of historical status updates to retain in the operation|`int`|`50`
-|maxHistorySummaryCount|The number of historical status summary records to retain in the operation|`int`|`50`
 |maxInFlight|The maximum number of transactions to have in-flight with the policy engine / blockchain transaction pool|`int`|`100`
 |nonceStateTimeout|How old the most recently submitted transaction record in our local state needs to be, before we make a request to the node to query the next nonce for a signing address|[`time.Duration`](https://pkg.go.dev/time#Duration)|`1h`
 

internal/confirmations/confirmations.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Kaleido, Inc.
+// Copyright © 2023 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -13,6 +13,7 @@
 // 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 confirmations
 
 import (

internal/tmconfig/tmconfig.go

@@ -31,8 +31,6 @@ var (
 	ConfirmationsStaleReceiptTimeout              = ffc("confirmations.staleReceiptTimeout")
 	ConfirmationsNotificationQueueLength          = ffc("confirmations.notificationQueueLength")
 	TransactionsMaxHistoryCount                   = ffc("transactions.maxHistoryCount")
-	TransactionsMaxHistorySummaryCount            = ffc("transactions.maxHistorySummaryCount")
-	TransactionsMaxHistoryActions                 = ffc("transactions.maxHistoryActions")
 	TransactionsMaxInFlight                       = ffc("transactions.maxInFlight")
 	TransactionsNonceStateTimeout                 = ffc("transactions.nonceStateTimeout")
 	PolicyLoopInterval                            = ffc("policyloop.interval")
@@ -77,8 +75,6 @@ var MetricsConfig config.Section
 func setDefaults() {
 	viper.SetDefault(string(TransactionsMaxInFlight), 100)
 	viper.SetDefault(string(TransactionsMaxHistoryCount), 50)
-	viper.SetDefault(string(TransactionsMaxHistorySummaryCount), 50)
-	viper.SetDefault(string(TransactionsMaxHistoryActions), 50)
 	viper.SetDefault(string(TransactionsNonceStateTimeout), "1h")
 	viper.SetDefault(string(ConfirmationsRequired), 20)
 	viper.SetDefault(string(ConfirmationsBlockQueueLength), 50)