Fix: fixed bug if objectstorage

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/golang/protobuf v1.3.2 // indirect
 	github.com/google/open-location-code/go v0.0.0-20190903173953-119bc96a3a51
 	github.com/gorilla/websocket v1.4.1
-	github.com/iotaledger/hive.go v0.0.0-20191205213014-6bee840fa69a
+	github.com/iotaledger/hive.go v0.0.0-20191208004610-567900b261bd
 	github.com/iotaledger/iota.go v1.0.0-beta.9
 	github.com/kr/text v0.1.0
 	github.com/labstack/echo v3.3.10+incompatible

go.sum

@@ -96,6 +96,10 @@ github.com/iotaledger/hive.go v0.0.0-20191205211001-eafba1daa31e h1:7F9mSTDfFwMl
 github.com/iotaledger/hive.go v0.0.0-20191205211001-eafba1daa31e/go.mod h1:7iqun29a1x0lymTrn0UJ3Z/yy0sUzUpoOZ1OYMrYN20=
 github.com/iotaledger/hive.go v0.0.0-20191205213014-6bee840fa69a h1:mI4GR5wcI5G6vjumuI2KH9r0mf5me3i6mWhDMtkKR04=
 github.com/iotaledger/hive.go v0.0.0-20191205213014-6bee840fa69a/go.mod h1:7iqun29a1x0lymTrn0UJ3Z/yy0sUzUpoOZ1OYMrYN20=
+github.com/iotaledger/hive.go v0.0.0-20191206001944-418a9127c1eb h1:iMYyaySL2gEjOcPRzWZYCn4+vXkanq1b9Pr9fKSzdrI=
+github.com/iotaledger/hive.go v0.0.0-20191206001944-418a9127c1eb/go.mod h1:7iqun29a1x0lymTrn0UJ3Z/yy0sUzUpoOZ1OYMrYN20=
+github.com/iotaledger/hive.go v0.0.0-20191208004610-567900b261bd h1:hh8iusLOBylWNHeJNiZv6atCbO7vzjCLlg53pNAMkFk=
+github.com/iotaledger/hive.go v0.0.0-20191208004610-567900b261bd/go.mod h1:7iqun29a1x0lymTrn0UJ3Z/yy0sUzUpoOZ1OYMrYN20=
 github.com/iotaledger/iota.go v1.0.0-beta.7 h1:OaUNahPvOdQz2nKcgeAfcUdxlEDlEV3xwLIkwzZ1B/U=
 github.com/iotaledger/iota.go v1.0.0-beta.7/go.mod h1:dMps6iMVU1pf5NDYNKIw4tRsPeC8W3ZWjOvYHOO1PMg=
 github.com/iotaledger/iota.go v1.0.0-beta.9 h1:c654s9pkdhMBkABUvWg+6k91MEBbdtmZXP1xDfQpajg=

packages/ledgerstate/conflict_id.go

@@ -9,17 +9,17 @@ import (
 
 type ConflictId [conflictSetIdLength]byte
 
-func NewConflictSetId(conflictBytes ...interface{}) (result ConflictId) {
+func NewConflictId(conflictBytes ...interface{}) (result ConflictId) {
 	switch len(conflictBytes) {
 	case 2:
 		transferHash, ok := conflictBytes[0].(TransferHash)
 		if !ok {
-			panic("expected first parameter of NewConflictSetId to be a TransferHash")
+			panic("expected first parameter of NewConflictId to be a TransferHash")
 		}
 
 		addressHash, ok := conflictBytes[0].(TransferHash)
 		if !ok {
-			panic("expected second parameter of NewConflictSetId to be a AddressHash")
+			panic("expected second parameter of NewConflictId to be a AddressHash")
 		}
 
 		fullConflictSetIdentifier := make([]byte, transferHashLength+addressHashLength)
@@ -29,7 +29,7 @@ func NewConflictSetId(conflictBytes ...interface{}) (result ConflictId) {
 		result = blake2b.Sum256(fullConflictSetIdentifier)
 	case 1:
 	default:
-		panic("invalid parameter count when calling NewConflictSetId")
+		panic("invalid parameter count when calling NewConflictId")
 	}
 
 	return

packages/ledgerstate/ledgerstate.go

@@ -152,9 +152,7 @@ func (ledgerState *LedgerState) BookTransfer(transfer *Transfer) (err error) {
 			return
 		}
 
-		if !targetReality.PersistenceEnabled() {
-			targetReality.Persist()
-		}
+		targetReality.Persist()
 	})
 
 	return

packages/ledgerstate/ledgerstate_test.go

@@ -233,7 +233,7 @@ func TestAggregateAggregatedRealities(t *testing.T) {
 	multiSpend(ledgerState, 1, aggregatedOutputs0[0], aggregatedOutputs1[0])
 	multiSpend(ledgerState, 1, aggregatedOutputs0[1], aggregatedOutputs2[0])
 
-	time.Sleep(1000 * time.Millisecond)
+	time.Sleep(2000 * time.Millisecond)
 
 	objectstorage.WaitForWritesToFlush()
 
@@ -247,7 +247,7 @@ func TestAggregateAggregatedRealities(t *testing.T) {
 
 	multiSpend(ledgerState, 2, outputs0[0], outputs1[0])
 
-	time.Sleep(1000 * time.Millisecond)
+	time.Sleep(2000 * time.Millisecond)
 
 	objectstorage.WaitForWritesToFlush()
 

packages/ledgerstate/transfer_output.go

@@ -57,9 +57,20 @@ func (transferOutput *TransferOutput) GetAddressHash() (addressHash AddressHash)
 }
 
 func (transferOutput *TransferOutput) SetRealityId(realityId RealityId) {
-	transferOutput.realityIdMutex.Lock()
-	transferOutput.realityId = realityId
-	transferOutput.realityIdMutex.Unlock()
+	transferOutput.realityIdMutex.RLock()
+	if transferOutput.realityId != realityId {
+		transferOutput.realityIdMutex.RUnlock()
+
+		transferOutput.realityIdMutex.Lock()
+		if transferOutput.realityId != realityId {
+			transferOutput.realityId = realityId
+
+			transferOutput.SetModified()
+		}
+		transferOutput.realityIdMutex.Unlock()
+	} else {
+		transferOutput.realityIdMutex.RUnlock()
+	}
 }
 
 func (transferOutput *TransferOutput) GetBalances() []*ColoredBalance {