actually populate forward hub UUID

2 files changed, 6 insertions, 3 deletions

diff --git a/src/hub/src/spreadspace.org/sfive/s5store_test.go b/src/hub/src/spreadspace.org/sfive/s5store_test.go
index 91d51ee..e74e3d7 100644
--- a/src/hub/src/spreadspace.org/sfive/s5store_test.go
+++ b/src/hub/src/spreadspace.org/sfive/s5store_test.go
@@ -497,7 +497,7 @@ func TestForwardedDataUpdates(t *testing.T) {
 	if err := store.AppendMany(data); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-
+	myLastId := 10
 	forwardedHub := "05defdfa-e7d1-4ca8-8b5c-02abb0088d29"
 
 	// check if there are no updates for this hub in store
@@ -531,11 +531,12 @@ func TestForwardedDataUpdates(t *testing.T) {
 		in := DataUpdateFull{0, "", -1, "", -1, sourceData, upd}
 		in.SourceHubUuid = forwardedHub
 		in.SourceHubDataUpdateId = 3 - i // out of order
-		in.ForwardHubUuid = ""
-		in.ForwardHubDataUpdateId = 0
 		if err = store.Append(in); err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
+		myLastId = myLastId + 1
+		in.ForwardHubUuid = store.GetStoreId()
+		in.ForwardHubDataUpdateId = myLastId
 		expected = append(expected, in)
 		upd.StartTime = upd.StartTime.Add(time.Duration(upd.Duration) * time.Millisecond)
 	}
diff --git a/src/hub/src/spreadspace.org/sfive/s5typesStore.go b/src/hub/src/spreadspace.org/sfive/s5typesStore.go
index 404505e..bba4433 100644
--- a/src/hub/src/spreadspace.org/sfive/s5typesStore.go
+++ b/src/hub/src/spreadspace.org/sfive/s5typesStore.go
@@ -139,6 +139,8 @@ func (s *DataUpdateFull) CopyFromDataUpdateDb(v dataUpdateDb, srcHubUuid, hubUui
 	} else {
 		s.SourceHubUuid = srcHubUuid
 		s.SourceHubDataUpdateId = v.SourceHubDataUpdateId
+		s.ForwardHubUuid = hubUuid
+		s.ForwardHubDataUpdateId = id
 	}
 
 	s.StartTime = time.Unix((v.StartTime / 1000), (v.StartTime%1000)*1000000)