change author json (#229)

fractalplatform · May 5, 2019 · 67cdfa9 · 67cdfa9
1 parent 4e25606
commit 67cdfa9
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/common/author.go b/common/author.go
@@ -36,9 +36,9 @@ type StorageAuthor struct {
 }
 
 type AuthorJSON struct {
-	Type     AuthorType
-	OwnerStr string
-	Weight   uint64
+	authorType AuthorType
+	OwnerStr   string `json:"owner"`
+	Weight     uint64 `json:"weight"`
 }
 
 func NewAuthor(owner Owner, weight uint64) *Author {
@@ -135,11 +135,11 @@ func (a *Author) decode(sa *StorageAuthor) error {
 func (a *Author) MarshalJSON() ([]byte, error) {
 	switch aTy := a.Owner.(type) {
 	case Name:
-		return json.Marshal(&AuthorJSON{Type: AccountNameType, OwnerStr: aTy.String(), Weight: a.Weight})
+		return json.Marshal(&AuthorJSON{authorType: AccountNameType, OwnerStr: aTy.String(), Weight: a.Weight})
 	case PubKey:
-		return json.Marshal(&AuthorJSON{Type: PubKeyType, OwnerStr: aTy.String(), Weight: a.Weight})
+		return json.Marshal(&AuthorJSON{authorType: PubKeyType, OwnerStr: aTy.String(), Weight: a.Weight})
 	case Address:
-		return json.Marshal(&AuthorJSON{Type: AddressType, OwnerStr: aTy.String(), Weight: a.Weight})
+		return json.Marshal(&AuthorJSON{authorType: AddressType, OwnerStr: aTy.String(), Weight: a.Weight})
 	}
 	return nil, errors.New("Author marshal failed")
 }
@@ -149,7 +149,7 @@ func (a *Author) UnmarshalJSON(data []byte) error {
 	if err := json.Unmarshal(data, aj); err != nil {
 		return err
 	}
-	switch aj.Type {
+	switch aj.authorType {
 	case AccountNameType:
 		a.Owner = Name(aj.OwnerStr)
 		a.Weight = aj.Weight