Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/sov-github-actions' into sov-git…
Browse files Browse the repository at this point in the history 
…hub-actions
  • Loading branch information
@axenteoctavian
axenteoctavian committed Dec 11, 2024
2 parents 99596a5 + 803e158 commit d44a3e4
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cmd/sovereignnode/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
Expand Down
4 changes: 2 additions & 2 deletions cmd/sovereignnode/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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=
Expand Down
1 change: 1 addition & 0 deletions cmd/sovereignnode/sovereignNodeRunner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1224,6 +1224,7 @@ func (snr *sovereignNodeRunner) CreateManagedStatusComponents(
IsInImportMode: isInImportMode,
StatusCoreComponents: managedStatusCoreComponents,
CryptoComponents: cryptoComponents,
IsSovereign: true,
}

statusComponentsFactory, err := statusComp.NewStatusComponentsFactory(statArgs)
Expand Down
7 changes: 6 additions & 1 deletion factory/status/statusComponents.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 {
Expand All @@ -45,6 +46,7 @@ type StatusComponentsFactoryArgs struct {
StateComponents factory.StateComponentsHolder
CryptoComponents factory.CryptoComponentsHolder
IsInImportMode bool
IsSovereign bool
}

type statusComponentsFactory struct {
Expand All @@ -61,6 +63,7 @@ type statusComponentsFactory struct {
stateComponents factory.StateComponentsHolder
cryptoComponents factory.CryptoComponentsHolder
isInImportMode bool
isSovereign bool
}

var log = logger.GetOrCreate("factory")
Expand Down Expand Up @@ -105,6 +108,7 @@ func NewStatusComponentsFactory(args StatusComponentsFactoryArgs) (*statusCompon
stateComponents: args.StateComponents,
isInImportMode: args.IsInImportMode,
cryptoComponents: args.CryptoComponents,
isSovereign: args.IsSovereign,
}, nil
}

Expand Down Expand Up @@ -229,6 +233,7 @@ func (scf *statusComponentsFactory) makeElasticIndexerArgs() indexerFactory.Args
UseKibana: elasticSearchConfig.UseKibana,
ImportDB: scf.isInImportMode,
HeaderMarshaller: scf.coreComponents.InternalMarshalizer(),
Sovereign: scf.isSovereign,
}
}

Expand Down
4 changes: 3 additions & 1 deletion factory/status/statusComponents_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 {
Expand Down Expand Up @@ -63,6 +64,7 @@ func createMockStatusComponentsFactoryArgs() statusComp.StatusComponentsFactoryA
ManagedPeersHolderField: &testscommon.ManagedPeersHolderStub{},
},
IsInImportMode: false,
IsSovereign: false,
}
}

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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=
Expand Down
1 change: 1 addition & 0 deletions integrationTests/realcomponents/processorRunner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ func (pr *ProcessorRunner) createStatusComponents(tb testing.TB) {
StateComponents: pr.StateComponents,
CryptoComponents: pr.CryptoComponents,
IsInImportMode: false,
IsSovereign: false,
}

statusFactory, err := factoryStatus.NewStatusComponentsFactory(argsStatus)
Expand Down
1 change: 1 addition & 0 deletions node/nodeRunner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1112,6 +1112,7 @@ func (nr *nodeRunner) CreateManagedStatusComponents(
IsInImportMode: isInImportMode,
StatusCoreComponents: managedStatusCoreComponents,
CryptoComponents: cryptoComponents,
IsSovereign: false,
}

statusComponentsFactory, err := statusComp.NewStatusComponentsFactory(statArgs)
Expand Down

0 comments on commit d44a3e4

Please sign in to comment.