diff --git a/api/utils.go b/api/utils.go index 2486d4d66143bb7fe6b660a9d23da26e70828652..799e3abf5a2410d15a1299c6d682ef801fdd439c 100644 --- a/api/utils.go +++ b/api/utils.go @@ -20,9 +20,9 @@ const ( // Maximum input image size (in bytes) maxSize int64 = 12000000 // Desired number of pixels in output image - desiredSize = 640*480 + desiredSize = 640 * 480 // Desired number of pixels in output image for preview - desiredPreviewSize = 32*24 + desiredPreviewSize = 32 * 24 ) // CompressJpeg takes a JPEG image in byte format @@ -76,7 +76,6 @@ func CompressJpeg(imgBytes []byte) ([]byte, error) { return newImgBuf.Bytes(), nil } - // CompressJpeg takes a JPEG image in byte format // and compresses it based on desired output size func CompressJpegForPreview(imgBytes []byte) ([]byte, error) { diff --git a/bindings/url.go b/bindings/url.go index 0322b6c3dd05318bbce6a1d9dee8ed9caeebf7da..f561540f3ecf89fb1b67e139549208884fe46779 100644 --- a/bindings/url.go +++ b/bindings/url.go @@ -7,10 +7,9 @@ package bindings - import ( - "gitlab.com/xx_network/primitives/id" "fmt" + "gitlab.com/xx_network/primitives/id" ) const dashboardBaseURL = "https://dashboard.xx.network" diff --git a/groupChat/send.go b/groupChat/send.go index 03c513ccc032ab28778dfb94bb44d05c1362355e..f5bf054fb2cb3b318ab61d15912001f1507af23f 100644 --- a/groupChat/send.go +++ b/groupChat/send.go @@ -73,7 +73,7 @@ func (m *Manager) createMessages(groupID *id.ID, msg []byte, timestamp time.Time cmixMsg := format.NewMessage(m.store.Cmix().GetGroup().GetP().ByteLen()) _, intlMsg, err := newMessageParts(cmixMsg.ContentsSize()) if err != nil { - return nil, group.MessageID{},errors.WithMessage(err,"Failed to make message parts for message ID") + return nil, group.MessageID{}, errors.WithMessage(err, "Failed to make message parts for message ID") } messageID := group.NewMessageID(groupID, setInternalPayload(intlMsg, timestamp, m.gs.GetUser().ID, msg)) diff --git a/groupChat/sendRequests.go b/groupChat/sendRequests.go index 555fd2c5e0cfc891ba8cf37877e6dc72353aebf3..6318e6420cf558034c9ac1dfa36f0db715ba677d 100644 --- a/groupChat/sendRequests.go +++ b/groupChat/sendRequests.go @@ -117,10 +117,9 @@ func (m Manager) sendRequest(memberID *id.ID, request []byte) ([]id.Round, error MessageType: message.GroupCreationRequest, } - recipent, err := m.store.E2e().GetPartner(memberID) - if err!=nil{ - return nil, errors.WithMessagef(err,"Failed to send request to %s " + + if err != nil { + return nil, errors.WithMessagef(err, "Failed to send request to %s "+ "because e2e relationship could not be found", memberID) } diff --git a/groupChat/sendRequests_test.go b/groupChat/sendRequests_test.go index 9f2b9c19f2eb2c65dd51d3f66e3dc512cfe991b3..c5ec225a4d4638e518fca793da97bdfabfea5162 100644 --- a/groupChat/sendRequests_test.go +++ b/groupChat/sendRequests_test.go @@ -38,7 +38,7 @@ func TestManager_ResendRequest(t *testing.T) { Created: g.Created.UnixNano(), } - for i := range g.Members{ + for i := range g.Members { grp := m.store.E2e().GetGroup() dhKey := grp.NewInt(int64(i + 42)) pubKey := diffieHellman.GeneratePublicKey(dhKey, grp) @@ -60,7 +60,6 @@ func TestManager_ResendRequest(t *testing.T) { t.Errorf("ResendRequest() returned an error: %+v", err) } - if status != AllSent { t.Errorf("ResendRequest() failed to return the expected status."+ "\nexpected: %s\nreceived: %s", AllSent, status) @@ -135,7 +134,7 @@ func TestManager_sendRequests(t *testing.T) { Created: g.Created.UnixNano(), } - for i := range g.Members{ + for i := range g.Members { grp := m.store.E2e().GetGroup() dhKey := grp.NewInt(int64(i + 42)) pubKey := diffieHellman.GeneratePublicKey(dhKey, grp) @@ -235,7 +234,7 @@ func TestManager_sendRequests_SendPartialSent(t *testing.T) { expectedErr := fmt.Sprintf(sendRequestPartialErr, (len(g.Members)-1)/2, len(g.Members)-1, "") - for i := range g.Members{ + for i := range g.Members { grp := m.store.E2e().GetGroup() dhKey := grp.NewInt(int64(i + 42)) pubKey := diffieHellman.GeneratePublicKey(dhKey, grp) @@ -274,7 +273,7 @@ func TestManager_sendRequest(t *testing.T) { prng := rand.New(rand.NewSource(42)) m, g := newTestManagerWithStore(prng, 10, 0, nil, nil, t) - for i := range g.Members{ + for i := range g.Members { grp := m.store.E2e().GetGroup() dhKey := grp.NewInt(int64(i + 42)) pubKey := diffieHellman.GeneratePublicKey(dhKey, grp) @@ -332,7 +331,6 @@ func TestManager_sendRequest_SendE2eError(t *testing.T) { t.Errorf("Failed to add partner %s: %+v", recipientID, err) } - _, err = m.sendRequest(recipientID, nil) if err == nil || !strings.Contains(err.Error(), expectedErr) { t.Errorf("sendRequest() failed to return the expected error."+ diff --git a/interfaces/params/E2E.go b/interfaces/params/E2E.go index 66f5b8f989468ba4988dfeefd7dc00cd5d438510..f3aed87855d884b9d99f8de68af9bac5a6a2ca1d 100644 --- a/interfaces/params/E2E.go +++ b/interfaces/params/E2E.go @@ -63,38 +63,36 @@ func (st SendType) String() string { // Network E2E Params - - type E2ESessionParams struct { // using the DH as a seed, both sides generate a number // of keys to use before they must rekey because // there are no keys to use. - MinKeys uint16 - MaxKeys uint16 + MinKeys uint16 + MaxKeys uint16 // the percent of keys before a rekey is attempted. must be <0 - RekeyThreshold float64 + RekeyThreshold float64 // extra keys generated and reserved for rekey attempts. This // many keys are not allowed to be used for sending messages // in order to ensure there are extras for rekeying. - NumRekeys uint16 + NumRekeys uint16 } // DEFAULT KEY GENERATION PARAMETERS // Hardcoded limits for keys // sets the number of keys very high, but with a low rekey threshold. In this case, if the other party is online, you will read const ( - minKeys uint16 = 1000 - maxKeys uint16 = 2000 - rekeyThrshold float64 = 0.05 - numReKeys uint16 = 16 + minKeys uint16 = 1000 + maxKeys uint16 = 2000 + rekeyThrshold float64 = 0.05 + numReKeys uint16 = 16 ) func GetDefaultE2ESessionParams() E2ESessionParams { return E2ESessionParams{ - MinKeys: minKeys, - MaxKeys: maxKeys, + MinKeys: minKeys, + MaxKeys: maxKeys, RekeyThreshold: rekeyThrshold, - NumRekeys: numReKeys, + NumRekeys: numReKeys, } } diff --git a/interfaces/params/message.go b/interfaces/params/message.go index 27a8ebd7d626445cc4c2ace03772d5dbbb6105ed..66371a7797d1c647c3a7efe96d801f4980e008fd 100644 --- a/interfaces/params/message.go +++ b/interfaces/params/message.go @@ -16,7 +16,7 @@ type Messages struct { MessageReceptionWorkerPoolSize uint MaxChecksGarbledMessage uint GarbledMessageWait time.Duration - RealtimeOnly bool + RealtimeOnly bool } func GetDefaultMessage() Messages { @@ -25,6 +25,6 @@ func GetDefaultMessage() Messages { MessageReceptionWorkerPoolSize: 4, MaxChecksGarbledMessage: 10, GarbledMessageWait: 15 * time.Minute, - RealtimeOnly: false, + RealtimeOnly: false, } } diff --git a/interfaces/params/network.go b/interfaces/params/network.go index 7e3b6f4ab3f72f664af8e5b7e9cc5d226950a37f..a89db50e17a1063d99ef17e26cd12ab6fcc9b24f 100644 --- a/interfaces/params/network.go +++ b/interfaces/params/network.go @@ -71,7 +71,7 @@ func (n Network) Marshal() ([]byte, error) { return json.Marshal(n) } -func (n Network) SetRealtimeOnlyAll()Network { +func (n Network) SetRealtimeOnlyAll() Network { n.RealtimeOnly = true n.Rounds.RealtimeOnly = true n.Messages.RealtimeOnly = true diff --git a/keyExchange/rekey.go b/keyExchange/rekey.go index 04bb31413af965f621884a01ab0f557c632ec504..ea14e92fa37bda8a2826eca10e43112fc1661530 100644 --- a/keyExchange/rekey.go +++ b/keyExchange/rekey.go @@ -164,8 +164,8 @@ func negotiate(instance *network.Instance, sendE2E interfaces.SendE2E, session, msgID) err = session.TrySetNegotiationStatus(e2e.Sent) if err != nil { - if (session.NegotiationStatus() == e2e.NewSessionTriggered) { - msg := fmt.Sprintf("All channels exhausted for %s, " + + if session.NegotiationStatus() == e2e.NewSessionTriggered { + msg := fmt.Sprintf("All channels exhausted for %s, "+ "rekey impossible.", session) return errors.WithMessage(err, msg) } diff --git a/network/follow.go b/network/follow.go index 6f98a33b50127d78f10e703b1c75081d02357d0f..817ba0effc0c01e744cd430effa7ecc874d746fb 100644 --- a/network/follow.go +++ b/network/follow.go @@ -372,7 +372,7 @@ func (m *manager) follow(report interfaces.ClientErrorReport, rng csprng.Source, var roundsWithMessages2 []id.Round - if !m.param.RealtimeOnly{ + if !m.param.RealtimeOnly { roundsWithMessages2 = identity.UR.Iterate(func(rid id.Round) bool { if gwRoundsState.Checked(rid) { return rounds.Checker(rid, filterList, identity.CR) @@ -381,7 +381,6 @@ func (m *manager) follow(report interfaces.ClientErrorReport, rng csprng.Source, }, roundsUnknown, abandon) } - for _, rid := range roundsWithMessages { //denote that the round has been looked at in the tracking store if identity.CR.Check(rid) { diff --git a/network/message/garbled_test.go b/network/message/garbled_test.go index 4a0f7eda9cb50fe7e7ed61aee72040d3756edb10..86f23b84776abbf2d2e9eae52fec21a690540ad9 100644 --- a/network/message/garbled_test.go +++ b/network/message/garbled_test.go @@ -152,7 +152,7 @@ func TestManager_CheckGarbledMessages(t *testing.T) { copy(fmp.Timestamp, ts) msg.SetContents(fmp.Bytes()) encryptedMsg := key.Encrypt(msg) - msg.SetIdentityFP(fingerprint.IdentityFP( msg.GetContents(), preimage.Data)) + msg.SetIdentityFP(fingerprint.IdentityFP(msg.GetContents(), preimage.Data)) i.Session.GetGarbledMessages().Add(encryptedMsg) stop := stoppable.NewSingle("stop") diff --git a/network/node/register.go b/network/node/register.go index 274703a8d1fb68f001e0ab692a8c726243ed38dc..0a741894cb2c5f0f60d530006ed6db387eff050f 100644 --- a/network/node/register.go +++ b/network/node/register.go @@ -39,9 +39,9 @@ import ( "time" ) - const maxAttempts = 5 -var delayTable = [5]time.Duration{0,5*time.Second,30*time.Second,60*time.Second,120*time.Second} + +var delayTable = [5]time.Duration{0, 5 * time.Second, 30 * time.Second, 60 * time.Second, 120 * time.Second} type RegisterNodeCommsInterface interface { SendRequestClientKeyMessage(host *connect.Host, @@ -53,7 +53,6 @@ func StartRegistration(sender *gateway.Sender, session *storage.Session, rngGen multi := stoppable.NewMulti("NodeRegistrations") - inProgess := &sync.Map{} // we are relying on the in progress check to // ensure there is only a single operator at a time, as a result this is a map of ID -> int @@ -96,7 +95,7 @@ func registerNodes(sender *gateway.Sender, session *storage.Session, //keep track of how many times this has been attempted numAttempts := uint(1) - if nunAttemptsInterface, hasValue := attempts.LoadOrStore(nidStr, numAttempts); hasValue{ + if nunAttemptsInterface, hasValue := attempts.LoadOrStore(nidStr, numAttempts); hasValue { numAttempts = nunAttemptsInterface.(uint) attempts.Store(nidStr, numAttempts+1) } @@ -112,11 +111,11 @@ func registerNodes(sender *gateway.Sender, session *storage.Session, if err != nil { jww.ERROR.Printf("Failed to register node: %+v", err) //if we have not reached the attempt limit for this gateway, send it back into the channel to retry - if numAttempts <maxAttempts{ - go func(){ + if numAttempts < maxAttempts { + go func() { //delay the send for a backoff time.Sleep(delayTable[numAttempts-1]) - c<-gw + c <- gw }() } } @@ -125,8 +124,6 @@ func registerNodes(sender *gateway.Sender, session *storage.Session, } } - - //registerWithNode serves as a helper for RegisterWithNodes // It registers a user with a specific in the client's ndf. func registerWithNode(sender *gateway.Sender, comms RegisterNodeCommsInterface, @@ -181,7 +178,6 @@ func requestKey(sender *gateway.Sender, comms RegisterNodeCommsInterface, uci *user.CryptographicIdentity, store *cmix.Store, rng csprng.Source, stop *stoppable.Single) (*cyclic.Int, []byte, uint64, error) { - grp := store.GetGroup() // FIXME: Why 256 bits? -- this is spec but not explained, it has diff --git a/network/rounds/manager.go b/network/rounds/manager.go index f220583de8de98ab706b48db3a2b24d6a6168078..43d1f5f5a1e9acc4b09fc360d583d16e7e73c51e 100644 --- a/network/rounds/manager.go +++ b/network/rounds/manager.go @@ -58,12 +58,11 @@ func (m *Manager) StartProcessors() stoppable.Stoppable { } // Start the periodic unchecked round worker - if !m.params.RealtimeOnly{ + if !m.params.RealtimeOnly { stopper := stoppable.NewSingle("UncheckRound") go m.processUncheckedRounds(m.params.UncheckRoundPeriod, backOffTable, stopper) multi.Add(stopper) } - return multi } diff --git a/network/rounds/remoteFilters_test.go b/network/rounds/remoteFilters_test.go index 51d26973d9f024142ed89b04e57d8f7117992268..43be06bf6d9f9719d45d630ab2f44b73fdfb7a5a 100644 --- a/network/rounds/remoteFilters_test.go +++ b/network/rounds/remoteFilters_test.go @@ -98,4 +98,4 @@ func TestRemoteFilter_FirstLastRound(t *testing.T) { "\n\tExpected: %v\n\tReceived: %v", receivedLastRound, firstRound+uint64(roundRange)) } -} \ No newline at end of file +} diff --git a/network/rounds/retrieve.go b/network/rounds/retrieve.go index 00f6675375243ef4025ad86f87751b578f185c1c..7151dd92de4d110e8a79f514e0dd4a1190e065a9 100644 --- a/network/rounds/retrieve.go +++ b/network/rounds/retrieve.go @@ -49,7 +49,7 @@ func (m *Manager) processMessageRetrieval(comms messageRetrievalComms, case rl := <-m.lookupRoundMessages: ri := rl.roundInfo jww.DEBUG.Printf("Checking for messages in round %d", ri.ID) - if !m.params.RealtimeOnly{ + if !m.params.RealtimeOnly { err := m.Session.UncheckedRounds().AddRound(id.Round(ri.ID), ri, rl.identity.Source, rl.identity.EphId) if err != nil { @@ -57,7 +57,6 @@ func (m *Manager) processMessageRetrieval(comms messageRetrievalComms, } } - // Convert gateways in round to proper ID format gwIds := make([]*id.ID, len(ri.Topology)) for i, idBytes := range ri.Topology { @@ -132,7 +131,7 @@ func (m *Manager) processMessageRetrieval(comms messageRetrievalComms, m.messageBundles <- bundle jww.DEBUG.Printf("Removing round %d from unchecked store", ri.ID) - if !m.params.RealtimeOnly{ + if !m.params.RealtimeOnly { err = m.Session.UncheckedRounds().Remove(id.Round(ri.ID), rl.identity.Source, rl.identity.EphId) if err != nil { jww.ERROR.Printf("Could not remove round %d "+ @@ -140,7 +139,6 @@ func (m *Manager) processMessageRetrieval(comms messageRetrievalComms, } } - } } @@ -196,14 +194,13 @@ func (m *Manager) getMessagesFromGateway(roundID id.Round, " in round %d. This happening every once in a while is normal,"+ " but can be indicative of a problem if it is consistent", m.TransmissionID, roundID) - if m.params.RealtimeOnly{ + if m.params.RealtimeOnly { err = m.Session.UncheckedRounds().Remove(roundID, identity.Source, identity.EphId) if err != nil { jww.ERROR.Printf("Failed to remove round %d: %+v", roundID, err) } } - return message.Bundle{}, nil } diff --git a/single/responseMessage.go b/single/responseMessage.go index 72d3bbdb666f4d6153ed59cf20caa9e64b49d7fd..191038dcb7665b17578268c85623af858b1601fb 100644 --- a/single/responseMessage.go +++ b/single/responseMessage.go @@ -14,11 +14,11 @@ import ( ) const ( - partNumLen = 1 - maxPartsLen = 1 - responseMinSize = receptionMessageVersionLen + partNumLen + maxPartsLen + sizeSize + partNumLen = 1 + maxPartsLen = 1 + responseMinSize = receptionMessageVersionLen + partNumLen + maxPartsLen + sizeSize receptionMessageVersion = 0 - receptionMessageVersionLen = 1 + receptionMessageVersionLen = 1 ) /* @@ -60,7 +60,7 @@ func mapResponseMessagePart(data []byte) responseMessagePart { return responseMessagePart{ data: data, version: data[:receptionMessageVersionLen], - partNum: data[receptionMessageVersionLen:receptionMessageVersionLen+partNumLen], + partNum: data[receptionMessageVersionLen : receptionMessageVersionLen+partNumLen], maxParts: data[receptionMessageVersionLen+partNumLen : receptionMessageVersionLen+maxPartsLen+partNumLen], size: data[receptionMessageVersionLen+maxPartsLen+partNumLen : responseMinSize], contents: data[responseMinSize:], diff --git a/single/responseMessage_test.go b/single/responseMessage_test.go index b97aa27b544b03779bc28c32e6a9232722fd815f..f9a78f068fb90021f1a7a9f9571ca02d244b91d1 100644 --- a/single/responseMessage_test.go +++ b/single/responseMessage_test.go @@ -21,7 +21,7 @@ func Test_newResponseMessagePart(t *testing.T) { payloadSize := prng.Intn(2000) expected := responseMessagePart{ data: make([]byte, payloadSize), - version: make([]byte, receptionMessageVersionLen), + version: make([]byte, receptionMessageVersionLen), partNum: make([]byte, partNumLen), maxParts: make([]byte, maxPartsLen), size: make([]byte, sizeSize), diff --git a/single/response_test.go b/single/response_test.go index 2a6c74521b593b490f3ee53f92aeff488f6bba7f..fcacf19a51bb2c15bcdb961b53665e67248837da 100644 --- a/single/response_test.go +++ b/single/response_test.go @@ -23,7 +23,7 @@ import ( func TestManager_GetMaxResponsePayloadSize(t *testing.T) { m := newTestManager(0, false, t) cmixPrimeSize := m.store.Cmix().GetGroup().GetP().ByteLen() - expectedSize := 2*cmixPrimeSize - format.KeyFPLen - format.MacLen - format.RecipientIDLen - responseMinSize-1 + expectedSize := 2*cmixPrimeSize - format.KeyFPLen - format.MacLen - format.RecipientIDLen - responseMinSize - 1 testSize := m.GetMaxResponsePayloadSize() if expectedSize != testSize { diff --git a/single/transmitMessage.go b/single/transmitMessage.go index 6676a3ae5d754efa6bf1434e9ccb263214f23bb6..17ce73acd2a6a5183c5c173f31eb23bd950f41c7 100644 --- a/single/transmitMessage.go +++ b/single/transmitMessage.go @@ -61,7 +61,7 @@ func mapTransmitMessage(data []byte, pubKeySize int) transmitMessage { return transmitMessage{ data: data, version: data[:transmitMessageVersionSize], - pubKey: data[transmitMessageVersionSize:transmitMessageVersionSize+pubKeySize], + pubKey: data[transmitMessageVersionSize : transmitMessageVersionSize+pubKeySize], payload: data[transmitMessageVersionSize+pubKeySize:], } } diff --git a/single/transmitMessage_test.go b/single/transmitMessage_test.go index 5125526ab47e3d98e7f9e4c81306492f129a1772..b6c62d25b71f507d54d1f69a70c0a35e932af628 100644 --- a/single/transmitMessage_test.go +++ b/single/transmitMessage_test.go @@ -140,7 +140,7 @@ func TestTransmitMessage_SetPayload_GetPayload_GetPayloadSize(t *testing.T) { prng := rand.New(rand.NewSource(42)) externalPayloadSize := prng.Intn(2000) pubKeySize := prng.Intn(externalPayloadSize) - payloadSize := externalPayloadSize - pubKeySize-transmitMessageVersionSize + payloadSize := externalPayloadSize - pubKeySize - transmitMessageVersionSize payload := make([]byte, payloadSize) prng.Read(payload) m := newTransmitMessage(externalPayloadSize, pubKeySize) @@ -153,7 +153,6 @@ func TestTransmitMessage_SetPayload_GetPayload_GetPayloadSize(t *testing.T) { "\nexpected: %+v\nreceived: %+v", payload, testPayload) } - if payloadSize != m.GetPayloadSize() { t.Errorf("GetContentsSize() returned incorrect content size."+ "\nexpected: %d\nreceived: %d", payloadSize, m.GetPayloadSize()) diff --git a/storage/cmix/store.go b/storage/cmix/store.go index 641261c9d85fb0f2718058c420ecb797cd00aaea..5947900089ea3ec047c6ce676eb27264cc20dca9 100644 --- a/storage/cmix/store.go +++ b/storage/cmix/store.go @@ -23,17 +23,17 @@ import ( const prefix = "cmix" const currentStoreVersion = 0 const ( - storeKey = "KeyStore" - grpKey = "GroupKey" + storeKey = "KeyStore" + grpKey = "GroupKey" ) type Store struct { - nodes map[id.ID]*key - validUntil uint64 - keyId []byte - grp *cyclic.Group - kv *versioned.KV - mux sync.RWMutex + nodes map[id.ID]*key + validUntil uint64 + keyId []byte + grp *cyclic.Group + kv *versioned.KV + mux sync.RWMutex } // NewStore returns a new cMix storage object. @@ -42,9 +42,9 @@ func NewStore(grp *cyclic.Group, kv *versioned.KV) (*Store, error) { kv = kv.Prefix(prefix) s := &Store{ - nodes: make(map[id.ID]*key), - grp: grp, - kv: kv, + nodes: make(map[id.ID]*key), + grp: grp, + kv: kv, } err := utility.StoreGroup(kv, grp, grpKey) diff --git a/storage/fileTransfer/fileMessage.go b/storage/fileTransfer/fileMessage.go index 03269326bbeab891e4678c888994fc35ea1026a6..90fd6eb30345f2aa5eda31d313058aaadd437ee6 100644 --- a/storage/fileTransfer/fileMessage.go +++ b/storage/fileTransfer/fileMessage.go @@ -78,7 +78,7 @@ func UnmarshalPartMessage(b []byte) (PartMessage, error) { // Marshal returns the byte representation of the PartMessage. func (m PartMessage) Marshal() []byte { b := make([]byte, len(m.data)) - copy(b,m.data) + copy(b, m.data) return b } @@ -97,7 +97,7 @@ func (m PartMessage) SetPartNum(num uint16) { // GetPart returns the file part data from the message. func (m PartMessage) GetPart() []byte { b := make([]byte, len(m.part)) - copy(b,m.part) + copy(b, m.part) return b } diff --git a/storage/fileTransfer/receiveTransfer_test.go b/storage/fileTransfer/receiveTransfer_test.go index 281bb373822ee0642a6c02c07c814d402cd3d174..0edd3cfe63112c519c45046a009ecce868c3cde3 100644 --- a/storage/fileTransfer/receiveTransfer_test.go +++ b/storage/fileTransfer/receiveTransfer_test.go @@ -557,7 +557,7 @@ func TestReceivedTransfer_AddPart(t *testing.T) { cmixMsg.SetMac(mac) // Add encrypted part - complete, err := rt.AddPart(cmixMsg,fpNum) + complete, err := rt.AddPart(cmixMsg, fpNum) if err != nil { t.Errorf("AddPart returned an error: %+v", err) } @@ -1156,4 +1156,4 @@ func newEmptyReceivedTransfer(numParts, numFps uint16, kv *versioned.KV, } return tid, rt, fileData -} \ No newline at end of file +} diff --git a/storage/fileTransfer/sentTransfer.go b/storage/fileTransfer/sentTransfer.go index cdffaaeca6807c4025b9bf90925130e6be9cbcb5..115eee1de2d8a95ef302edec84d6271e1ddce4ce 100644 --- a/storage/fileTransfer/sentTransfer.go +++ b/storage/fileTransfer/sentTransfer.go @@ -447,7 +447,7 @@ func (st *SentTransfer) GetEncryptedPart(partNum uint16, contentsSize int) (encP errors.Errorf(noPartNumErr, partNum) } - if err = partMsg.SetPart(part); err != nil{ + if err = partMsg.SetPart(part); err != nil { return nil, nil, format.Fingerprint{}, err } diff --git a/storage/fileTransfer/sentTransfer_test.go b/storage/fileTransfer/sentTransfer_test.go index 033992bf84b42aa4bf54431ac50e3c3c0b132998..ea4302b47a857125522b97be4cc13c4503e2d39c 100644 --- a/storage/fileTransfer/sentTransfer_test.go +++ b/storage/fileTransfer/sentTransfer_test.go @@ -850,9 +850,9 @@ func TestSentTransfer_GetEncryptedPart(t *testing.T) { "\nexpected: %+v\nreceived: %+v", partNum, i, expectedPart, partMsg.GetPart()) } - if partMsg.GetPartNum()!=i % st.numParts{ - t.Errorf("Number of part did not match, expected: %d, " + - "received: %d", i % st.numParts, partMsg.GetPartNum()) + if partMsg.GetPartNum() != i%st.numParts { + t.Errorf("Number of part did not match, expected: %d, "+ + "received: %d", i%st.numParts, partMsg.GetPartNum()) } } } diff --git a/storage/utility/messageBuffer.go b/storage/utility/messageBuffer.go index d9c7ad749a3b1011c976fe97387dac281aec7086..f9891edce39ff284406bd1878df8a627f3a7589b 100644 --- a/storage/utility/messageBuffer.go +++ b/storage/utility/messageBuffer.go @@ -270,7 +270,7 @@ func (mb *MessageBuffer) Next() (interface{}, bool) { // Retrieve the message for storage m, err = mb.handler.LoadMessage(mb.kv, makeStoredMessageKey(mb.key, h)) if err != nil { - m=nil + m = nil jww.ERROR.Printf("Failed to load message %s from store, "+ "this may happen on occasion due to replays to increase "+ "reliability: %v", h, err) @@ -292,7 +292,7 @@ func next(msgMap map[MessageHash]struct{}) MessageHash { func (mb *MessageBuffer) Succeeded(m interface{}) { h := mb.handler.HashMessage(m) jww.TRACE.Printf("Critical Messages Succeeded(%s)", - base64.StdEncoding.EncodeToString((h[:]))) + base64.StdEncoding.EncodeToString(h[:])) mb.mux.Lock() defer mb.mux.Unlock() diff --git a/storage/utility/meteredCmixMessageBuffer.go b/storage/utility/meteredCmixMessageBuffer.go index 9060dbb7ea2424f87879032371ee25944ff64851..b0b425800738fba7af41ae7339bafdf6ffa1cd6d 100644 --- a/storage/utility/meteredCmixMessageBuffer.go +++ b/storage/utility/meteredCmixMessageBuffer.go @@ -114,7 +114,7 @@ func LoadMeteredCmixMessageBuffer(kv *versioned.KV, key string) (*MeteredCmixMes } func (mcmb *MeteredCmixMessageBuffer) Add(m format.Message) { - if m.GetPrimeByteLen()==0{ + if m.GetPrimeByteLen() == 0 { jww.FATAL.Panicf("Cannot handle a metered " + "cmix message with a length of 0") }