diff --git a/packages/ledgerstate/constants.go b/packages/ledgerstate/constants.go deleted file mode 100644 index 692e0689a4b68c92d7760fc17daed020e8807e47..0000000000000000000000000000000000000000 --- a/packages/ledgerstate/constants.go +++ /dev/null @@ -1,9 +0,0 @@ -package ledgerstate - -import ( - "github.com/iotaledger/goshimmer/packages/ledgerstate/reality" -) - -var ( - MAIN_REALITY_ID = reality.NewId("MAIN_REALITY") -) diff --git a/packages/ledgerstate/ledgerstate.go b/packages/ledgerstate/ledgerstate.go index 8bf724d957109459c187199012813e8dcac28460..2faad9c2b978ba4b30bc85c6639ae53fff06912d 100644 --- a/packages/ledgerstate/ledgerstate.go +++ b/packages/ledgerstate/ledgerstate.go @@ -40,7 +40,7 @@ func NewLedgerState(storageId string) *LedgerState { conflictSets: objectstorage.New(storageId+"CONFLICT_SETS", conflict.Factory, objectstorage.CacheTime(1*time.Second)), } - mainReality := newReality(MAIN_REALITY_ID) + mainReality := newReality(reality.MAIN_ID) mainReality.ledgerState = result mainReality.SetPreferred() result.realities.Store(mainReality).Release() @@ -49,7 +49,7 @@ func NewLedgerState(storageId string) *LedgerState { } func (ledgerState *LedgerState) AddTransferOutput(transferHash transfer.Hash, addressHash address.Address, balances ...*coloredcoins.ColoredBalance) *LedgerState { - ledgerState.GetReality(MAIN_REALITY_ID).Consume(func(object objectstorage.StorableObject) { + ledgerState.GetReality(reality.MAIN_ID).Consume(func(object objectstorage.StorableObject) { mainReality := object.(*Reality) mainReality.bookTransferOutput(transfer.NewTransferOutput(ledgerState.transferOutputBookings, reality.EmptyId, transferHash, addressHash, balances...)) @@ -127,10 +127,10 @@ func (ledgerState *LedgerState) ForEachTransferOutput(callback func(object *obje } func (ledgerState *LedgerState) CreateReality(id reality.Id) { - newReality := newReality(id, MAIN_REALITY_ID) + newReality := newReality(id, reality.MAIN_ID) newReality.ledgerState = ledgerState - if mainReality, mainRealityErr := ledgerState.realities.Load(MAIN_REALITY_ID[:]); mainRealityErr != nil { + if mainReality, mainRealityErr := ledgerState.realities.Load(reality.MAIN_ID[:]); mainRealityErr != nil { panic(mainRealityErr) } else { mainReality.Consume(func(object objectstorage.StorableObject) { @@ -249,7 +249,7 @@ func (ledgerState *LedgerState) GenerateRealityVisualization(pngFilename string) func (ledgerState *LedgerState) AggregateRealities(realityIds ...reality.Id) *objectstorage.CachedObject { switch len(realityIds) { case 0: - if loadedReality, loadedRealityErr := ledgerState.realities.Load(MAIN_REALITY_ID[:]); loadedRealityErr != nil { + if loadedReality, loadedRealityErr := ledgerState.realities.Load(reality.MAIN_ID[:]); loadedRealityErr != nil { panic(loadedRealityErr) } else { loadedReality.Get().(*Reality).ledgerState = ledgerState @@ -395,7 +395,7 @@ func (ledgerState *LedgerState) Prune() *LedgerState { panic(err) } - mainReality := newReality(MAIN_REALITY_ID) + mainReality := newReality(reality.MAIN_ID) mainReality.ledgerState = ledgerState mainReality.SetPreferred() ledgerState.realities.Store(mainReality).Release() diff --git a/packages/ledgerstate/outputs.png b/packages/ledgerstate/outputs.png index 4ef22e7241420c274afc5c857af241d0bbdf5ee2..348a7350b16b3d38a6d4731c7c51f2740fe6110c 100644 Binary files a/packages/ledgerstate/outputs.png and b/packages/ledgerstate/outputs.png differ diff --git a/packages/ledgerstate/outputs1.png b/packages/ledgerstate/outputs1.png index 1aa2d13490e2d8775daa3e656fb0e7c0295c9a80..b695948cae29c186c1eb156ee1b0a736ab1045f6 100644 Binary files a/packages/ledgerstate/outputs1.png and b/packages/ledgerstate/outputs1.png differ diff --git a/packages/ledgerstate/outputs2.png b/packages/ledgerstate/outputs2.png index 989e5eb91f2f4ff3e458e642e7db6603e0211738..1628d4989b63e5a01f961b83453c40dd02db4996 100644 Binary files a/packages/ledgerstate/outputs2.png and b/packages/ledgerstate/outputs2.png differ diff --git a/packages/ledgerstate/reality/constants.go b/packages/ledgerstate/reality/constants.go new file mode 100644 index 0000000000000000000000000000000000000000..b73e224d644421557e47b71d1ac8292b77dff823 --- /dev/null +++ b/packages/ledgerstate/reality/constants.go @@ -0,0 +1,5 @@ +package reality + +var ( + MAIN_ID = NewId("MAIN_REALITY") +) diff --git a/packages/ledgerstate/visualizer.go b/packages/ledgerstate/visualizer.go index 58adaae6c2cf14b8c674da21432dc644fbe608b4..b4a086971bd1fd4498846da1d2140693e17496d8 100644 --- a/packages/ledgerstate/visualizer.go +++ b/packages/ledgerstate/visualizer.go @@ -38,7 +38,7 @@ func (visualizer *Visualizer) RenderTransferOutputs(pngFileName string) error { }) return true - }, MAIN_REALITY_ID) + }, reality.MAIN_ID) return graphviz.RenderPNG(visualizer.graph, pngFileName) } @@ -97,12 +97,12 @@ func (visualizer *Visualizer) getRealitySubGraph(realityId reality.Id) *dot.Grap realityGraph, exists := visualizer.realitySubGraphs[realityId] if !exists { visualizer.ledgerState.GetReality(realityId).Consume(func(object objectstorage.StorableObject) { - reality := object.(*Reality) + currentReality := object.(*Reality) - parentRealities := reality.GetParentRealityIds() + parentRealities := currentReality.GetParentRealityIds() switch true { case len(parentRealities) > 1: - realityGraph = visualizer.getRealitySubGraph(MAIN_REALITY_ID).Subgraph("AGGREGATED REALITY [ "+visualizer.generateRealityName(realityId)+" ]", dot.ClusterOption{}) + realityGraph = visualizer.getRealitySubGraph(reality.MAIN_ID).Subgraph("AGGREGATED REALITY [ "+visualizer.generateRealityName(realityId)+" ]", dot.ClusterOption{}) visualizer.styleRealitySubGraph(realityGraph, realityTypeAggregated)