From fd14a0763ebf0bcdf6a719aafcbf73f7f5153400 Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Thu, 10 Mar 2022 16:34:57 +0100 Subject: entity: allow to resolve identities when numashalling operations --- entity/dag/common_test.go | 2 +- entity/dag/entity.go | 2 +- entity/dag/operation_pack.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'entity') diff --git a/entity/dag/common_test.go b/entity/dag/common_test.go index 25289b76..532e3ff8 100644 --- a/entity/dag/common_test.go +++ b/entity/dag/common_test.go @@ -67,7 +67,7 @@ func (o *op2) Author() identity.Interface { return o.author } -func unmarshaler(author identity.Interface, raw json.RawMessage) (Operation, error) { +func unmarshaler(author identity.Interface, raw json.RawMessage, resolver identity.Resolver) (Operation, error) { var t struct { OperationType int `json:"type"` } diff --git a/entity/dag/entity.go b/entity/dag/entity.go index c4368514..60adcbe6 100644 --- a/entity/dag/entity.go +++ b/entity/dag/entity.go @@ -26,7 +26,7 @@ type Definition struct { // the Namespace in git (bugs, prs, ...) Namespace string // a function decoding a JSON message into an Operation - OperationUnmarshaler func(author identity.Interface, raw json.RawMessage) (Operation, error) + OperationUnmarshaler func(author identity.Interface, raw json.RawMessage, resolver identity.Resolver) (Operation, error) // the expected format version number, that can be used for data migration/upgrade FormatVersion uint } diff --git a/entity/dag/operation_pack.go b/entity/dag/operation_pack.go index 5d74e13f..2794606a 100644 --- a/entity/dag/operation_pack.go +++ b/entity/dag/operation_pack.go @@ -314,7 +314,7 @@ func unmarshallPack(def Definition, resolver identity.Resolver, data []byte) ([] for _, raw := range aux.Operations { // delegate to specialized unmarshal function - op, err := def.OperationUnmarshaler(author, raw) + op, err := def.OperationUnmarshaler(author, raw, resolver) if err != nil { return nil, nil, err } -- cgit