diff --git a/Makefile b/Makefile index 25edc0f05d5333c3c5bc541fd4a3cec93aebf485..d8cbcd4df475b056e627ef0a5c6518f40360ac54 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ update_release: GOFLAGS="" go get gitlab.com/xx_network/primitives@release GOFLAGS="" go get gitlab.com/elixxir/primitives@release GOFLAGS="" go get gitlab.com/xx_network/crypto@release - GOFLAGS="" go get gitlab.com/elixxir/crypto@release + GOFLAGS="" go get gitlab.com/elixxir/crypto@bob/FileTransfer GOFLAGS="" go get gitlab.com/xx_network/comms@release GOFLAGS="" go get gitlab.com/elixxir/comms@release @@ -34,4 +34,4 @@ update_master: master: update_master clean build version -release: update_release clean build version +release: update_release clean build diff --git a/bindings/group.go b/bindings/group.go index 2df75cdd1519618135db887d28cef16d14a12b29..8d20c533d5979fc1032adbbdcc2a093b0ca8f8d4 100644 --- a/bindings/group.go +++ b/bindings/group.go @@ -13,6 +13,7 @@ import ( gs "gitlab.com/elixxir/client/groupChat/groupStore" "gitlab.com/elixxir/crypto/group" "gitlab.com/xx_network/primitives/id" + "time" ) // GroupChat object contains the group chat manager. @@ -291,7 +292,7 @@ func (gmr *GroupMessageReceive) GetTimestampNano() int64 { // GetTimestampMS returns the message timestamp in milliseconds. func (gmr *GroupMessageReceive) GetTimestampMS() int64 { - return gmr.Timestamp.UnixNano() / 1_000_000 + return gmr.Timestamp.UnixNano() / int64(time.Millisecond) } // GetRoundID returns the ID of the round the message was sent on. @@ -308,5 +309,5 @@ func (gmr *GroupMessageReceive) GetRoundTimestampNano() int64 { // GetRoundTimestampMS returns the timestamp, in milliseconds, of the round the // message was sent on. func (gmr *GroupMessageReceive) GetRoundTimestampMS() int64 { - return gmr.RoundTimestamp.UnixNano() / 1_000_000 + return gmr.RoundTimestamp.UnixNano() / int64(time.Millisecond) }