diff --git a/bindings/e2eAuth.go b/bindings/e2eAuth.go index b2277eb3e3c77ae54ab933dae3b23c9edee9ef25..12a031cf969fe3aa36cdf0cdadd06503adcfaf38 100644 --- a/bindings/e2eAuth.go +++ b/bindings/e2eAuth.go @@ -35,12 +35,12 @@ import ( // // Parameters: // - partnerContact - the marshalled bytes of the contact.Contact object. -// - myFacts - stringified list of fact.FactList. +// - factsListJson - the JSON marshalled bytes of fact.FactList. // // Returns: // - int64 - ID of the round (convert to uint64) func (e *E2e) Request(partnerContact, factsListJson []byte) (int64, error) { - var factsList []Fact + var factsList fact.FactList err := json.Unmarshal(factsListJson, &factsList) if err != nil { return 0, err @@ -51,15 +51,7 @@ func (e *E2e) Request(partnerContact, factsListJson []byte) (int64, error) { return 0, err } - myFacts := fact.FactList{} - for _, f := range factsList { - myFacts = append(myFacts, fact.Fact{ - Fact: f.Fact, - T: fact.FactType(f.Type), - }) - } - - roundID, err := e.api.GetAuth().Request(partner, myFacts) + roundID, err := e.api.GetAuth().Request(partner, factsList) return int64(roundID), err } diff --git a/bindings/identity.go b/bindings/identity.go index f1b56803184de8491f3c93ad43d89008f6227bd4..23225baf0852c364a5411f3078c0f7569bbba572 100644 --- a/bindings/identity.go +++ b/bindings/identity.go @@ -123,67 +123,41 @@ func GetPubkeyFromContact(marshaled []byte) ([]byte, error) { // Fact Functions // //////////////////////////////////////////////////////////////////////////////// -// Fact is an internal fact type for use in the bindings layer. -// -// JSON example: -// { -// "Fact": "Zezima", -// "Type": 0 -// } -type Fact struct { - Fact string - Type int -} - // SetFactsOnContact replaces the facts on the contact with the passed in facts // pass in empty facts in order to clear the facts. // // Parameters: -// - marshaled - JSON marshalled contact.Contact object -// - facts - JSON marshalled Fact object. -func SetFactsOnContact(marshaled []byte, facts []byte) ([]byte, error) { +// - marshaled - the JSON marshalled by of contact.Contact object. +// - factListJSON - the JSON marshalled bytes of fact.FactList. +func SetFactsOnContact(marshaled []byte, factListJSON []byte) ([]byte, error) { cnt, err := contact.Unmarshal(marshaled) if err != nil { return nil, err } - factsList := make([]Fact, 0) - err = json.Unmarshal(facts, &factsList) + var factsList fact.FactList + err = json.Unmarshal(factListJSON, &factsList) if err != nil { return nil, err } - realFactList := make(fact.FactList, 0, len(factsList)) - for i := range factsList { - realFactList = append(realFactList, fact.Fact{ - Fact: factsList[i].Fact, - T: fact.FactType(factsList[i].Type), - }) - } + cnt.Facts = factsList - cnt.Facts = realFactList return cnt.Marshal(), nil } -// GetFactsFromContact accepts a marshalled contact.Contact object and returns -// its marshalled list of Fact objects. +// GetFactsFromContact returns the fact list in the contact.Contact object. +// +// Parameters: +// - marshaled - the JSON marshalled by of contact.Contact object. +// +// Returns: +// - []byte - the JSON marshalled bytes of fact.FactList. func GetFactsFromContact(marshaled []byte) ([]byte, error) { cnt, err := contact.Unmarshal(marshaled) if err != nil { return nil, err } - factsList := make([]Fact, len(cnt.Facts)) - for i := range cnt.Facts { - factsList = append(factsList, Fact{ - Fact: cnt.Facts[i].Fact, - Type: int(cnt.Facts[i].T), - }) - } - - factsListMarshaled, err := json.Marshal(&factsList) - if err != nil { - return nil, err - } - return factsListMarshaled, nil + return json.Marshal(&cnt.Facts) } diff --git a/bindings/identity_test.go b/bindings/identity_test.go index 662f1f5c000021def40a17a50d9c9646b8a78779..949d51b2451f574d4fdfb2f634f9995588fa88fa 100644 --- a/bindings/identity_test.go +++ b/bindings/identity_test.go @@ -41,22 +41,6 @@ func TestIdentity_JSON(t *testing.T) { t.Log(string(im)) } -func TestFacts_JSON(t *testing.T) { - fl := []Fact{ - { - Fact: "Zezima", - Type: 0, - }, - { - Fact: "Zezima@osrs.org", - Type: 2, - }, - } - flm, _ := json.Marshal(fl) - t.Log("Marshalled []Fact") - t.Log(string(flm)) -} - func getGroup() *cyclic.Group { return cyclic.NewGroup( large.NewIntFromString("E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D4941"+ diff --git a/bindings/ud.go b/bindings/ud.go index 6ce8f8b3af073057e210675ff3203ef5ba364746..4272fbdb18f31bf7491074633a908e310973c91c 100644 --- a/bindings/ud.go +++ b/bindings/ud.go @@ -277,7 +277,7 @@ func (ud *UserDiscovery) PermanentDeleteAccount(factJson []byte) error { // passed in is not UD service does not associate this fact with this user. // // Parameters: -// - factJson - a JSON marshalled fact.Fact +// - factJson - a JSON marshalled [fact.Fact] func (ud *UserDiscovery) RemoveFact(factJson []byte) error { var f fact.Fact err := json.Unmarshal(factJson, &f)