From ae6b41198feb42843c8b10bf54bba4628268477d Mon Sep 17 00:00:00 2001 From: axenteoctavian Date: Mon, 9 Dec 2024 12:22:11 +0200 Subject: [PATCH 1/5] sovereign flag for indexer --- cmd/sovereignnode/go.mod | 2 +- cmd/sovereignnode/go.sum | 4 ++-- cmd/sovereignnode/sovereignNodeRunner.go | 1 + factory/status/statusComponents.go | 7 ++++++- factory/status/statusComponents_test.go | 6 ++++-- go.mod | 2 +- go.sum | 4 ++-- integrationTests/realcomponents/processorRunner.go | 1 + 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/cmd/sovereignnode/go.mod b/cmd/sovereignnode/go.mod index 3c8e6efe968..fbea66677d4 100644 --- a/cmd/sovereignnode/go.mod +++ b/cmd/sovereignnode/go.mod @@ -120,7 +120,7 @@ require ( github.com/multiversx/concurrent-map v0.1.4 // indirect github.com/multiversx/mx-chain-communication-go v1.1.1 // indirect github.com/multiversx/mx-chain-crypto-go v1.2.12 // indirect - github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241127134617-0cff5f1f7f64 // indirect + github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241209094715-e3add432336f // indirect github.com/multiversx/mx-chain-scenario-go v1.4.4 // indirect github.com/multiversx/mx-chain-storage-go v1.0.16 // indirect github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20241119132002-2fa80c5ec516 // indirect diff --git a/cmd/sovereignnode/go.sum b/cmd/sovereignnode/go.sum index 5aabb8b3d7a..aa7a7cb32ea 100644 --- a/cmd/sovereignnode/go.sum +++ b/cmd/sovereignnode/go.sum @@ -389,8 +389,8 @@ github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a h1: github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a/go.mod h1:P/YBoFnt25XUaCQ7Q/SD15vhnc9yV5JDhHxyFO9P8Z0= github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk= github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4= -github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241127134617-0cff5f1f7f64 h1:G34urNrX71aMBZi1fVrKeNRCHKLn5mORZ/vS25VFh4M= -github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241127134617-0cff5f1f7f64/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY= +github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241209094715-e3add432336f h1:tZ01D/WXqByv0802GJ53k9oYShXdXI1ZhxnhmFojHc0= +github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241209094715-e3add432336f/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY= github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc= github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ= github.com/multiversx/mx-chain-scenario-go v1.4.4 h1:DVE2V+FPeyD/yWoC+KEfPK3jsFzHeruelESfpTlf460= diff --git a/cmd/sovereignnode/sovereignNodeRunner.go b/cmd/sovereignnode/sovereignNodeRunner.go index b454e27b7fb..28515e1ccf2 100644 --- a/cmd/sovereignnode/sovereignNodeRunner.go +++ b/cmd/sovereignnode/sovereignNodeRunner.go @@ -1228,6 +1228,7 @@ func (snr *sovereignNodeRunner) CreateManagedStatusComponents( IsInImportMode: isInImportMode, StatusCoreComponents: managedStatusCoreComponents, CryptoComponents: cryptoComponents, + IsSovereignType: true, } statusComponentsFactory, err := statusComp.NewStatusComponentsFactory(statArgs) diff --git a/factory/status/statusComponents.go b/factory/status/statusComponents.go index 6fcab933d71..93a654d0b42 100644 --- a/factory/status/statusComponents.go +++ b/factory/status/statusComponents.go @@ -7,6 +7,8 @@ import ( "github.com/multiversx/mx-chain-core-go/core/check" factoryMarshalizer "github.com/multiversx/mx-chain-core-go/marshal/factory" indexerFactory "github.com/multiversx/mx-chain-es-indexer-go/process/factory" + logger "github.com/multiversx/mx-chain-logger-go" + "github.com/multiversx/mx-chain-go/common" "github.com/multiversx/mx-chain-go/common/statistics" swVersionFactory "github.com/multiversx/mx-chain-go/common/statistics/softwareVersion/factory" @@ -19,7 +21,6 @@ import ( "github.com/multiversx/mx-chain-go/process" "github.com/multiversx/mx-chain-go/sharding" "github.com/multiversx/mx-chain-go/sharding/nodesCoordinator" - logger "github.com/multiversx/mx-chain-logger-go" ) type statusComponents struct { @@ -45,6 +46,7 @@ type StatusComponentsFactoryArgs struct { StateComponents factory.StateComponentsHolder CryptoComponents factory.CryptoComponentsHolder IsInImportMode bool + IsSovereignType bool } type statusComponentsFactory struct { @@ -61,6 +63,7 @@ type statusComponentsFactory struct { stateComponents factory.StateComponentsHolder cryptoComponents factory.CryptoComponentsHolder isInImportMode bool + isSovereignType bool } var log = logger.GetOrCreate("factory") @@ -105,6 +108,7 @@ func NewStatusComponentsFactory(args StatusComponentsFactoryArgs) (*statusCompon stateComponents: args.StateComponents, isInImportMode: args.IsInImportMode, cryptoComponents: args.CryptoComponents, + isSovereignType: args.IsSovereignType, }, nil } @@ -229,6 +233,7 @@ func (scf *statusComponentsFactory) makeElasticIndexerArgs() indexerFactory.Args UseKibana: elasticSearchConfig.UseKibana, ImportDB: scf.isInImportMode, HeaderMarshaller: scf.coreComponents.InternalMarshalizer(), + SovereignType: scf.isSovereignType, } } diff --git a/factory/status/statusComponents_test.go b/factory/status/statusComponents_test.go index 40c91ba255b..bbde0944335 100644 --- a/factory/status/statusComponents_test.go +++ b/factory/status/statusComponents_test.go @@ -6,6 +6,8 @@ import ( "github.com/multiversx/mx-chain-communication-go/websocket/data" "github.com/multiversx/mx-chain-core-go/core" + "github.com/stretchr/testify/require" + "github.com/multiversx/mx-chain-go/config" errorsMx "github.com/multiversx/mx-chain-go/errors" "github.com/multiversx/mx-chain-go/factory/mock" @@ -18,7 +20,6 @@ import ( "github.com/multiversx/mx-chain-go/testscommon/genesisMocks" "github.com/multiversx/mx-chain-go/testscommon/shardingMocks" "github.com/multiversx/mx-chain-go/testscommon/statusHandler" - "github.com/stretchr/testify/require" ) func createMockStatusComponentsFactoryArgs() statusComp.StatusComponentsFactoryArgs { @@ -62,7 +63,8 @@ func createMockStatusComponentsFactoryArgs() statusComp.StatusComponentsFactoryA CryptoComponents: &mock.CryptoComponentsMock{ ManagedPeersHolderField: &testscommon.ManagedPeersHolderStub{}, }, - IsInImportMode: false, + IsInImportMode: false, + IsSovereignType: false, } } diff --git a/go.mod b/go.mod index 1afc57f7920..6b51ed4aeb3 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/multiversx/mx-chain-communication-go v1.1.1 github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a github.com/multiversx/mx-chain-crypto-go v1.2.12 - github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241127134617-0cff5f1f7f64 + github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241209094715-e3add432336f github.com/multiversx/mx-chain-logger-go v1.0.15 github.com/multiversx/mx-chain-scenario-go v1.4.4 github.com/multiversx/mx-chain-storage-go v1.0.16 diff --git a/go.sum b/go.sum index 22f938ea8ef..94a0cbc0c7b 100644 --- a/go.sum +++ b/go.sum @@ -391,8 +391,8 @@ github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a h1: github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a/go.mod h1:P/YBoFnt25XUaCQ7Q/SD15vhnc9yV5JDhHxyFO9P8Z0= github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk= github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4= -github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241127134617-0cff5f1f7f64 h1:G34urNrX71aMBZi1fVrKeNRCHKLn5mORZ/vS25VFh4M= -github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241127134617-0cff5f1f7f64/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY= +github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241209094715-e3add432336f h1:tZ01D/WXqByv0802GJ53k9oYShXdXI1ZhxnhmFojHc0= +github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241209094715-e3add432336f/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY= github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc= github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ= github.com/multiversx/mx-chain-scenario-go v1.4.4 h1:DVE2V+FPeyD/yWoC+KEfPK3jsFzHeruelESfpTlf460= diff --git a/integrationTests/realcomponents/processorRunner.go b/integrationTests/realcomponents/processorRunner.go index 8598765e4eb..13ccef94172 100644 --- a/integrationTests/realcomponents/processorRunner.go +++ b/integrationTests/realcomponents/processorRunner.go @@ -356,6 +356,7 @@ func (pr *ProcessorRunner) createStatusComponents(tb testing.TB) { StateComponents: pr.StateComponents, CryptoComponents: pr.CryptoComponents, IsInImportMode: false, + IsSovereignType: false, } statusFactory, err := factoryStatus.NewStatusComponentsFactory(argsStatus) From 5206e866bce59cfcec584f03578bd431ca4abfa9 Mon Sep 17 00:00:00 2001 From: axenteoctavian Date: Wed, 11 Dec 2024 11:29:31 +0200 Subject: [PATCH 2/5] update after indexer changes --- cmd/sovereignnode/go.mod | 2 +- cmd/sovereignnode/go.sum | 4 ++-- factory/status/statusComponents.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/sovereignnode/go.mod b/cmd/sovereignnode/go.mod index fbea66677d4..1d3ba2ded8b 100644 --- a/cmd/sovereignnode/go.mod +++ b/cmd/sovereignnode/go.mod @@ -120,7 +120,7 @@ require ( github.com/multiversx/concurrent-map v0.1.4 // indirect github.com/multiversx/mx-chain-communication-go v1.1.1 // indirect github.com/multiversx/mx-chain-crypto-go v1.2.12 // indirect - github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241209094715-e3add432336f // indirect + github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211085735-9ca95d364311 // indirect github.com/multiversx/mx-chain-scenario-go v1.4.4 // indirect github.com/multiversx/mx-chain-storage-go v1.0.16 // indirect github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20241119132002-2fa80c5ec516 // indirect diff --git a/cmd/sovereignnode/go.sum b/cmd/sovereignnode/go.sum index aa7a7cb32ea..49695304099 100644 --- a/cmd/sovereignnode/go.sum +++ b/cmd/sovereignnode/go.sum @@ -389,8 +389,8 @@ github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a h1: github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a/go.mod h1:P/YBoFnt25XUaCQ7Q/SD15vhnc9yV5JDhHxyFO9P8Z0= github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk= github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4= -github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241209094715-e3add432336f h1:tZ01D/WXqByv0802GJ53k9oYShXdXI1ZhxnhmFojHc0= -github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241209094715-e3add432336f/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY= +github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211085735-9ca95d364311 h1:yjboP1HlAB7ZfF5b/f46uRMHHWs9jtU1Gxbb7PqdVhg= +github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211085735-9ca95d364311/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY= github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc= github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ= github.com/multiversx/mx-chain-scenario-go v1.4.4 h1:DVE2V+FPeyD/yWoC+KEfPK3jsFzHeruelESfpTlf460= diff --git a/factory/status/statusComponents.go b/factory/status/statusComponents.go index 93a654d0b42..f23234cb24f 100644 --- a/factory/status/statusComponents.go +++ b/factory/status/statusComponents.go @@ -233,7 +233,7 @@ func (scf *statusComponentsFactory) makeElasticIndexerArgs() indexerFactory.Args UseKibana: elasticSearchConfig.UseKibana, ImportDB: scf.isInImportMode, HeaderMarshaller: scf.coreComponents.InternalMarshalizer(), - SovereignType: scf.isSovereignType, + Sovereign: scf.isSovereignType, } } diff --git a/go.mod b/go.mod index 6b51ed4aeb3..677938b9a6c 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/multiversx/mx-chain-communication-go v1.1.1 github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a github.com/multiversx/mx-chain-crypto-go v1.2.12 - github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241209094715-e3add432336f + github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211085735-9ca95d364311 github.com/multiversx/mx-chain-logger-go v1.0.15 github.com/multiversx/mx-chain-scenario-go v1.4.4 github.com/multiversx/mx-chain-storage-go v1.0.16 diff --git a/go.sum b/go.sum index 94a0cbc0c7b..d7dd66aa08d 100644 --- a/go.sum +++ b/go.sum @@ -391,8 +391,8 @@ github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a h1: github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a/go.mod h1:P/YBoFnt25XUaCQ7Q/SD15vhnc9yV5JDhHxyFO9P8Z0= github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk= github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4= -github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241209094715-e3add432336f h1:tZ01D/WXqByv0802GJ53k9oYShXdXI1ZhxnhmFojHc0= -github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241209094715-e3add432336f/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY= +github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211085735-9ca95d364311 h1:yjboP1HlAB7ZfF5b/f46uRMHHWs9jtU1Gxbb7PqdVhg= +github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211085735-9ca95d364311/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY= github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc= github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ= github.com/multiversx/mx-chain-scenario-go v1.4.4 h1:DVE2V+FPeyD/yWoC+KEfPK3jsFzHeruelESfpTlf460= From 0f3affcfbd0d8f61a3e8cf054d2827140249e6b6 Mon Sep 17 00:00:00 2001 From: axenteoctavian Date: Wed, 11 Dec 2024 11:43:53 +0200 Subject: [PATCH 3/5] go.mod update --- cmd/sovereignnode/go.mod | 2 +- cmd/sovereignnode/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/sovereignnode/go.mod b/cmd/sovereignnode/go.mod index 1d3ba2ded8b..8b30685fc3f 100644 --- a/cmd/sovereignnode/go.mod +++ b/cmd/sovereignnode/go.mod @@ -120,7 +120,7 @@ require ( github.com/multiversx/concurrent-map v0.1.4 // indirect github.com/multiversx/mx-chain-communication-go v1.1.1 // indirect github.com/multiversx/mx-chain-crypto-go v1.2.12 // indirect - github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211085735-9ca95d364311 // indirect + github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211094055-23de51462ca4 // indirect github.com/multiversx/mx-chain-scenario-go v1.4.4 // indirect github.com/multiversx/mx-chain-storage-go v1.0.16 // indirect github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20241119132002-2fa80c5ec516 // indirect diff --git a/cmd/sovereignnode/go.sum b/cmd/sovereignnode/go.sum index 49695304099..1057d2ab96a 100644 --- a/cmd/sovereignnode/go.sum +++ b/cmd/sovereignnode/go.sum @@ -389,8 +389,8 @@ github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a h1: github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a/go.mod h1:P/YBoFnt25XUaCQ7Q/SD15vhnc9yV5JDhHxyFO9P8Z0= github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk= github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4= -github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211085735-9ca95d364311 h1:yjboP1HlAB7ZfF5b/f46uRMHHWs9jtU1Gxbb7PqdVhg= -github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211085735-9ca95d364311/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY= +github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211094055-23de51462ca4 h1:IfjK6IQy65eMWr/FEv3CMUz13ZqH9sWLnKv85/AoayM= +github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211094055-23de51462ca4/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY= github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc= github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ= github.com/multiversx/mx-chain-scenario-go v1.4.4 h1:DVE2V+FPeyD/yWoC+KEfPK3jsFzHeruelESfpTlf460= diff --git a/go.mod b/go.mod index 677938b9a6c..16bf992d03c 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/multiversx/mx-chain-communication-go v1.1.1 github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a github.com/multiversx/mx-chain-crypto-go v1.2.12 - github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211085735-9ca95d364311 + github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211094055-23de51462ca4 github.com/multiversx/mx-chain-logger-go v1.0.15 github.com/multiversx/mx-chain-scenario-go v1.4.4 github.com/multiversx/mx-chain-storage-go v1.0.16 diff --git a/go.sum b/go.sum index d7dd66aa08d..7083580b210 100644 --- a/go.sum +++ b/go.sum @@ -391,8 +391,8 @@ github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a h1: github.com/multiversx/mx-chain-core-go v1.2.24-0.20241120082646-16e4df50ab4a/go.mod h1:P/YBoFnt25XUaCQ7Q/SD15vhnc9yV5JDhHxyFO9P8Z0= github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk= github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4= -github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211085735-9ca95d364311 h1:yjboP1HlAB7ZfF5b/f46uRMHHWs9jtU1Gxbb7PqdVhg= -github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211085735-9ca95d364311/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY= +github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211094055-23de51462ca4 h1:IfjK6IQy65eMWr/FEv3CMUz13ZqH9sWLnKv85/AoayM= +github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211094055-23de51462ca4/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY= github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc= github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ= github.com/multiversx/mx-chain-scenario-go v1.4.4 h1:DVE2V+FPeyD/yWoC+KEfPK3jsFzHeruelESfpTlf460= From 27196b15ac47cd9e88fd0de9b20e5a34d8b5d8d0 Mon Sep 17 00:00:00 2001 From: axenteoctavian Date: Wed, 11 Dec 2024 11:51:49 +0200 Subject: [PATCH 4/5] renaming --- cmd/sovereignnode/sovereignNodeRunner.go | 2 +- factory/status/statusComponents.go | 8 ++++---- factory/status/statusComponents_test.go | 4 ++-- integrationTests/realcomponents/processorRunner.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/sovereignnode/sovereignNodeRunner.go b/cmd/sovereignnode/sovereignNodeRunner.go index 317f960de70..fabff48dedb 100644 --- a/cmd/sovereignnode/sovereignNodeRunner.go +++ b/cmd/sovereignnode/sovereignNodeRunner.go @@ -1224,7 +1224,7 @@ func (snr *sovereignNodeRunner) CreateManagedStatusComponents( IsInImportMode: isInImportMode, StatusCoreComponents: managedStatusCoreComponents, CryptoComponents: cryptoComponents, - IsSovereignType: true, + IsSovereign: true, } statusComponentsFactory, err := statusComp.NewStatusComponentsFactory(statArgs) diff --git a/factory/status/statusComponents.go b/factory/status/statusComponents.go index f23234cb24f..7ccabdbd888 100644 --- a/factory/status/statusComponents.go +++ b/factory/status/statusComponents.go @@ -46,7 +46,7 @@ type StatusComponentsFactoryArgs struct { StateComponents factory.StateComponentsHolder CryptoComponents factory.CryptoComponentsHolder IsInImportMode bool - IsSovereignType bool + IsSovereign bool } type statusComponentsFactory struct { @@ -63,7 +63,7 @@ type statusComponentsFactory struct { stateComponents factory.StateComponentsHolder cryptoComponents factory.CryptoComponentsHolder isInImportMode bool - isSovereignType bool + isSovereign bool } var log = logger.GetOrCreate("factory") @@ -108,7 +108,7 @@ func NewStatusComponentsFactory(args StatusComponentsFactoryArgs) (*statusCompon stateComponents: args.StateComponents, isInImportMode: args.IsInImportMode, cryptoComponents: args.CryptoComponents, - isSovereignType: args.IsSovereignType, + isSovereign: args.IsSovereign, }, nil } @@ -233,7 +233,7 @@ func (scf *statusComponentsFactory) makeElasticIndexerArgs() indexerFactory.Args UseKibana: elasticSearchConfig.UseKibana, ImportDB: scf.isInImportMode, HeaderMarshaller: scf.coreComponents.InternalMarshalizer(), - Sovereign: scf.isSovereignType, + Sovereign: scf.isSovereign, } } diff --git a/factory/status/statusComponents_test.go b/factory/status/statusComponents_test.go index bbde0944335..cf38580afcf 100644 --- a/factory/status/statusComponents_test.go +++ b/factory/status/statusComponents_test.go @@ -63,8 +63,8 @@ func createMockStatusComponentsFactoryArgs() statusComp.StatusComponentsFactoryA CryptoComponents: &mock.CryptoComponentsMock{ ManagedPeersHolderField: &testscommon.ManagedPeersHolderStub{}, }, - IsInImportMode: false, - IsSovereignType: false, + IsInImportMode: false, + IsSovereign: false, } } diff --git a/integrationTests/realcomponents/processorRunner.go b/integrationTests/realcomponents/processorRunner.go index 13ccef94172..437af926b14 100644 --- a/integrationTests/realcomponents/processorRunner.go +++ b/integrationTests/realcomponents/processorRunner.go @@ -356,7 +356,7 @@ func (pr *ProcessorRunner) createStatusComponents(tb testing.TB) { StateComponents: pr.StateComponents, CryptoComponents: pr.CryptoComponents, IsInImportMode: false, - IsSovereignType: false, + IsSovereign: false, } statusFactory, err := factoryStatus.NewStatusComponentsFactory(argsStatus) From 627510b02aacf7171ef87a34d7c4e05034f1e8bd Mon Sep 17 00:00:00 2001 From: axenteoctavian Date: Wed, 11 Dec 2024 13:45:23 +0200 Subject: [PATCH 5/5] fixes after review --- node/nodeRunner.go | 1 + 1 file changed, 1 insertion(+) diff --git a/node/nodeRunner.go b/node/nodeRunner.go index bd73d932aca..f1ef0494a0f 100644 --- a/node/nodeRunner.go +++ b/node/nodeRunner.go @@ -1112,6 +1112,7 @@ func (nr *nodeRunner) CreateManagedStatusComponents( IsInImportMode: isInImportMode, StatusCoreComponents: managedStatusCoreComponents, CryptoComponents: cryptoComponents, + IsSovereign: false, } statusComponentsFactory, err := statusComp.NewStatusComponentsFactory(statArgs)