Cosmetics.

eoscanada · May 13, 2018 · dab5266 · dab5266
1 parent f9cd953
commit dab5266
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/actions.go b/actions.go
@@ -39,7 +39,7 @@ type ActionData struct {
 
 func NewActionData(obj interface{}) ActionData {
 	return ActionData{
-		HexData:  []byte(""),
+		HexData:  []byte{},
 		Data:     obj,
 		toServer: true,
 	}

diff --git a/cmd/eosapi/main.go b/cmd/eosapi/main.go
@@ -22,7 +22,7 @@ func main() {
 	for _, key := range []string{
 		"5JuWeC5KwZRVUQZ4eneYCYQ6Pa132QgvDQzEVJBA7XTgNTBWWRw",
 		"5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3",
-		"5K6CAnUcDpJzBJBCve3QfQjEsxHrC8jqYgnYE1tDv4rKbDLG58N", // latest bios boot
+		"5Hq1ynaptFCkRCiZy4MRyJtHnXivCPBFMDaWw4bcnXpx7YuxQwo", // latest bios boot
 	} {
 		if err := keyBag.Add(key); err != nil {
 			log.Fatalln("Couldn't load private key:", err)
@@ -105,7 +105,7 @@ func main() {
 
 	actionResp, err := api.SignPushActions(
 
-		system.NewNewAccount(AC("eosio"), AC("aaaaaaaaaaab"), ecc.MustNewPublicKey("EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV")),
+		system.NewNewAccount(AC("eosio"), AC("aaaaaaaaaaac"), ecc.MustNewPublicKey("EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV")),
 
 		//		token.NewTransfer(eos.AccountName("cbillett"), eos.AccountName("bozo"), eos.NewEOSAsset(100), ""),
 	)

diff --git a/encoder.go b/encoder.go
@@ -344,6 +344,8 @@ func (e *Encoder) writeActionData(actionData ActionData) (err error) {
 		}
 		println(fmt.Sprintf("writing action data, %T", actionData.Data))
 		return e.writeByteArray(raw)
+	} else if actionData.HexData != nil {
+		return e.writeByteArray(actionData.HexData)
 	}
 
 	return e.writeByteArray([]byte{})

diff --git a/types.go b/types.go
@@ -150,14 +150,14 @@ type PermissionLevel struct {
 
 type PermissionLevelWeight struct {
 	Permission PermissionLevel `json:"permission"`
-	Weight     uint16          `json:"weight"`
+	Weight     uint16          `json:"weight"` // weight_type
 }
 
 type Authority struct {
 	Threshold uint32                  `json:"threshold"`
-	Keys      []KeyWeight             `json:"keys"`
-	Accounts  []PermissionLevelWeight `json:"accounts"`
-	Waits     []WaitWeight            `json:"waits"`
+	Keys      []KeyWeight             `json:"keys,omitempty"`
+	Accounts  []PermissionLevelWeight `json:"accounts,omitempty"`
+	Waits     []WaitWeight            `json:"waits,omitempty"`
 }
 
 type KeyWeight struct {