Skip to content
Snippets Groups Projects
Commit 1691ea52 authored by Jake Taylor's avatar Jake Taylor
Browse files

fix XX-4170

parent 9e821883
No related branches found
No related tags found
3 merge requests!510Release,!365attempt to fix mutex segfault in HandleReceivedRequest,!354Channels impl
...@@ -201,11 +201,11 @@ func (s *Store) loadUnconfirmedFacts() error { ...@@ -201,11 +201,11 @@ func (s *Store) loadUnconfirmedFacts() error {
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// unconfirmedFactDisk is an object used to store the data of an unconfirmed fact. // unconfirmedFactDisk is an object used to store the data of an unconfirmed fact.
// It combines the key (confirmationId) and fact data (stringifiedFact) into a // It combines the key (ConfirmationId) and fact data (StringifiedFact) into a
// single JSON-able object. // single JSON-able object.
type unconfirmedFactDisk struct { type unconfirmedFactDisk struct {
confirmationId string ConfirmationId string
stringifiedFact string StringifiedFact string
} }
// marshalConfirmedFacts is a marshaller which serializes the data // marshalConfirmedFacts is a marshaller which serializes the data
...@@ -225,8 +225,8 @@ func (s *Store) marshalUnconfirmedFacts() ([]byte, error) { ...@@ -225,8 +225,8 @@ func (s *Store) marshalUnconfirmedFacts() ([]byte, error) {
ufdList := make([]unconfirmedFactDisk, 0, len(s.unconfirmedFacts)) ufdList := make([]unconfirmedFactDisk, 0, len(s.unconfirmedFacts))
for confirmationId, f := range s.unconfirmedFacts { for confirmationId, f := range s.unconfirmedFacts {
ufd := unconfirmedFactDisk{ ufd := unconfirmedFactDisk{
confirmationId: confirmationId, ConfirmationId: confirmationId,
stringifiedFact: f.Stringify(), StringifiedFact: f.Stringify(),
} }
ufdList = append(ufdList, ufd) ufdList = append(ufdList, ufd)
} }
...@@ -274,13 +274,13 @@ func (s *Store) unmarshalUnconfirmedFacts(data []byte) (map[string]fact.Fact, er ...@@ -274,13 +274,13 @@ func (s *Store) unmarshalUnconfirmedFacts(data []byte) (map[string]fact.Fact, er
unconfirmedFacts := make(map[string]fact.Fact, 0) unconfirmedFacts := make(map[string]fact.Fact, 0)
for i := range ufdList { for i := range ufdList {
ufd := ufdList[i] ufd := ufdList[i]
f, err := fact.UnstringifyFact(ufd.stringifiedFact) f, err := fact.UnstringifyFact(ufd.StringifiedFact)
if err != nil { if err != nil {
return unconfirmedFacts, errors.WithMessagef(err, return unconfirmedFacts, errors.WithMessagef(err,
malformedFactErr, string(data)) malformedFactErr, string(data))
} }
unconfirmedFacts[ufd.confirmationId] = f unconfirmedFacts[ufd.ConfirmationId] = f
} }
return unconfirmedFacts, nil return unconfirmedFacts, nil
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment