From f7a374ac476bf8b4a680887e68c482007ead4b81 Mon Sep 17 00:00:00 2001 From: "Leo Zhang (zhangchiqing)" Date: Wed, 6 Mar 2024 16:37:58 -0800 Subject: [PATCH 1/2] remove duplicated observer collection indexer --- cmd/execution_builder.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/execution_builder.go b/cmd/execution_builder.go index b4252aee26e..30d6f0d4a2d 100644 --- a/cmd/execution_builder.go +++ b/cmd/execution_builder.go @@ -23,7 +23,7 @@ import ( "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/host" "github.com/shirou/gopsutil/v3/mem" - "github.com/vmihailenco/msgpack" + "github.com/vmihailenco/msgpack/v4" "go.uber.org/atomic" "github.com/onflow/flow-go/admin/commands" @@ -220,7 +220,6 @@ func (builder *ExecutionNodeBuilder) LoadComponentsAndModules() { // TODO: will re-visit this once storehouse has implemented new WAL for checkpoint file of // payloadless trie. // Component("execution data pruner", exeNode.LoadExecutionDataPruner). - Component("observer collection indexer", exeNode.LoadObserverCollectionIndexer). Component("blob service", exeNode.LoadBlobService). Component("block data upload manager", exeNode.LoadBlockUploaderManager). Component("GCP block data uploader", exeNode.LoadGCPBlockDataUploader). From c3dd203eb8d29733edf6f799f2df7dc92ef696ac Mon Sep 17 00:00:00 2001 From: "Leo Zhang (zhangchiqing)" Date: Wed, 6 Mar 2024 16:46:13 -0800 Subject: [PATCH 2/2] revert msgpack version --- cmd/execution_builder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/execution_builder.go b/cmd/execution_builder.go index 30d6f0d4a2d..a6d819131e5 100644 --- a/cmd/execution_builder.go +++ b/cmd/execution_builder.go @@ -23,7 +23,7 @@ import ( "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/host" "github.com/shirou/gopsutil/v3/mem" - "github.com/vmihailenco/msgpack/v4" + "github.com/vmihailenco/msgpack" "go.uber.org/atomic" "github.com/onflow/flow-go/admin/commands"