Skip to content
Snippets Groups Projects
Commit 3143ccce authored by Jono Wenger's avatar Jono Wenger
Browse files

Merge branch 'release' of git.xx.network:elixxir/client into hotfix/groupNotification

 Conflicts:
	groupChat/manager.go
parents dad5702d 7d643227
Branches
Tags
2 merge requests!67Release,!55fully implemented trial hashing of identity fingerprints. Needs tests.
......@@ -349,6 +349,9 @@ func (gmr *GroupMessageReceive) GetTimestampNano() int64 {
func (gmr *GroupMessageReceive) GetTimestampMS() int64 {
ts := uint64(gmr.Timestamp.UnixNano()) / uint64(time.Millisecond)
// TODO: remove the print below once debugging is done.
jww.DEBUG.Printf("Received group message timestamp: %s", gmr.Timestamp)
jww.DEBUG.Printf("Received group message timestamp MS: %d", ts)
return int64(ts)
}
......@@ -367,5 +370,8 @@ func (gmr *GroupMessageReceive) GetRoundTimestampNano() int64 {
// message was sent on.
func (gmr *GroupMessageReceive) GetRoundTimestampMS() int64 {
ts := uint64(gmr.RoundTimestamp.UnixNano()) / uint64(time.Millisecond)
// TODO: remove the print below once debugging is done.
jww.DEBUG.Printf("Received group message round timestamp: %s", gmr.RoundTimestamp)
jww.DEBUG.Printf("Received group message round timestamp MS: %d", ts)
return int64(ts)
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment