diff --git a/auth/request.go b/auth/request.go index c43707904f835b19d1e64ba53cb4ec9fe550355f..76af994787f8e1658e13345bf14883e091e7790d 100644 --- a/auth/request.go +++ b/auth/request.go @@ -55,17 +55,20 @@ func RequestAuth(partner, me contact.Contact, message string, rng io.Reader, //lookup if an ongoing request is occurring rqType, sr, _, err := storage.Auth().GetRequest(partner.ID) - if err != nil && !strings.Contains(err.Error(), auth.NoRequest){ + if err == nil { if rqType == auth.Receive { - return 0, errors.WithMessage(err, - "Cannot send a request after receiving a request") + return 0, errors.Errorf("Cannot send a request after " + + "receiving a request") } else if rqType == auth.Sent { resend = true }else{ - return 0, errors.WithMessage(err, - "Cannot send a request after receiving unknown error " + - "on requesting contact status") + return 0, errors.Errorf("Cannot send a request after " + + " a stored request with unknown rqType: %d", rqType) } + }else if !strings.Contains(err.Error(), auth.NoRequest){ + return 0, errors.WithMessage(err, + "Cannot send a request after receiving unknown error " + + "on requesting contact status") } grp := storage.E2e().GetGroup() diff --git a/network/message/sendCmix.go b/network/message/sendCmix.go index 1b4f0e109ad3ea67078778c651856d299d2eb68b..2a7095843eb57c6f9af2af16ea9725fab0aac627 100644 --- a/network/message/sendCmix.go +++ b/network/message/sendCmix.go @@ -34,7 +34,7 @@ type sendCmixCommsInterface interface { } // 1.5 seconds -const sendTimeBuffer = 1500 * time.Millisecond +const sendTimeBuffer = 2500 * time.Millisecond // WARNING: Potentially Unsafe // Public manager function to send a message over CMIX diff --git a/network/message/sendUnsafe.go b/network/message/sendUnsafe.go index df7f05cb8df4ba368f3a3a19368dcb13214f7d49..19f7d5d5ce0bfe6dd14df77b76f0a21c824b2404 100644 --- a/network/message/sendUnsafe.go +++ b/network/message/sendUnsafe.go @@ -82,7 +82,7 @@ func (m *Manager) SendUnsafe(msg message.Send, param params.Unsafe) ([]id.Round, return nil, errors.Errorf("Failed to send %v/%v sub payloads:"+ " %s", numFail, len(partitions), errRtn) } else { - jww.INFO.Printf("Sucesfully Unsafe sent %d/%d to %s", + jww.INFO.Printf("Successfully Unsafe sent %d/%d to %s", len(partitions)-numFail, len(partitions), msg.Recipient) } diff --git a/storage/utility/blockStore.go b/storage/utility/blockStore.go index a405e9b966175b77f8a9803e2efbe72bf2cf27af..b29dcd12d56037d6e7d0622b1fbc47f8faea62b9 100644 --- a/storage/utility/blockStore.go +++ b/storage/utility/blockStore.go @@ -21,6 +21,7 @@ const ( const ( bsBuffLengthErr = "length of buffer %d != %d expected" bsKvSaveErr = "failed to save blockStore to KV: %+v" + bsKvInitSaveErr = "failed to save initial block: %+v" bsKvLoadErr = "failed to get BlockStore from storage: %+v" bsKvUnmarshalErr = "failed to unmarshal BlockStore loaded from storage: %+v" bJsonMarshalErr = "failed to JSON marshal block %d: %+v" @@ -218,6 +219,12 @@ func (bs *BlockStore) save() error { return errors.Errorf(bsKvSaveErr, err) } + // Save initial block + err = bs.saveBlock() + if err != nil { + return errors.Errorf(bsKvInitSaveErr, err) + } + return nil }