Merge pull request #115 from euforic/fix/govetwarnings

fix go vet errors and warnings
eoscanada · Apr 3, 2019 · 229d589 · 229d589
2 parents bba565e + 94e1979
commit 229d589
Show file tree

Hide file tree

Showing 13 changed files with 176 additions and 147 deletions.
diff --git a/btcsuite/btcd/btcec/btcec.go b/btcsuite/btcd/btcec/btcec.go
@@ -955,4 +955,4 @@ func initS256() {
 func S256() *KoblitzCurve {
 	initonce.Do(initAll)
 	return &secp256k1
-}
+}
diff --git a/btcsuite/btcd/btcec/btcec_test.go b/btcsuite/btcd/btcec/btcec_test.go
diff --git a/example_api_transfer_eos_test.go b/example_api_transfer_eos_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/eoscanada/eos-go/token"
 )
 
-func ExampleAPI_Transfer_EOS() {
+func ExampleAPI_PushTransaction_transfer_EOS() {
 	api := eos.New(getAPIURL())
 
 	keyBag := &eos.KeyBag{}

diff --git a/example_trx_unpack_test.go b/example_trx_unpack_test.go
@@ -7,7 +7,7 @@ import (
 	eos "github.com/eoscanada/eos-go"
 )
 
-func ExampleTrx_Unpack() {
+func ExamplePackedTransaction_Unpack() {
 	var packedTrx *eos.PackedTransaction
 	err := json.Unmarshal(packedTrxData(), &packedTrx)
 	if err != nil {

diff --git a/p2p/relay.go b/p2p/relay.go
@@ -69,7 +69,6 @@ func (r *Relay) startProxy(conn net.Conn) {
 }
 
 func (r *Relay) Start() error {
-
 	for {
 		ln, err := net.Listen("tcp", r.listeningAddress)
 		if err != nil {
@@ -88,6 +87,4 @@ func (r *Relay) Start() error {
 			go r.startProxy(conn)
 		}
 	}
-
-	return nil
 }
diff --git a/responses.go b/responses.go
@@ -45,10 +45,9 @@ type InfoResp struct {
 
 type BlockResp struct {
 	SignedBlock
-	ID              Checksum256  `json:"id"`
-	BlockNum        uint32       `json:"block_num"`
-	RefBlockPrefix  uint32       `json:"ref_block_prefix"`
-	BlockExtensions []*Extension `json:"block_extensions"`
+	ID             Checksum256 `json:"id"`
+	BlockNum       uint32      `json:"block_num"`
+	RefBlockPrefix uint32      `json:"ref_block_prefix"`
 }
 
 type ScheduledTransactionsResp struct {

diff --git a/system/linkauth.go b/system/linkauth.go
@@ -15,7 +15,10 @@ func NewLinkAuth(account, code eos.AccountName, actionName eos.ActionName, requi
 		Account: AN("eosio"),
 		Name:    ActN("linkauth"),
 		Authorization: []eos.PermissionLevel{
-			{account, eos.PermissionName("active")},
+			{
+				Actor:      account,
+				Permission: eos.PermissionName("active"),
+			},
 		},
 		ActionData: eos.NewActionData(LinkAuth{
 			Account:     account,

diff --git a/system/newaccount_test.go b/system/newaccount_test.go
@@ -21,7 +21,10 @@ func TestActionNewAccount(t *testing.T) {
 		Account: eos.AccountName("eosio"),
 		Name:    eos.ActionName("newaccount"),
 		Authorization: []eos.PermissionLevel{
-			{eos.AccountName("eosio"), eos.PermissionName("active")},
+			{
+				Actor:      eos.AccountName("eosio"),
+				Permission: eos.PermissionName("active"),
+			},
 		},
 		ActionData: eos.NewActionData(NewAccount{
 			Creator: eos.AccountName("eosio"),
@@ -78,7 +81,10 @@ func TestMarshalTransactionAndSigned(t *testing.T) {
 		Account: eos.AccountName("eosio"),
 		Name:    eos.ActionName("newaccount"),
 		Authorization: []eos.PermissionLevel{
-			{eos.AccountName("eosio"), eos.PermissionName("active")},
+			{
+				Actor:      eos.AccountName("eosio"),
+				Permission: eos.PermissionName("active"),
+			},
 		},
 		ActionData: eos.NewActionData(NewAccount{
 			Creator: eos.AccountName("eosio"),
@@ -109,7 +115,10 @@ func TestMarshalTransactionAndPack(t *testing.T) {
 		Account: eos.AccountName("eosio"),
 		Name:    eos.ActionName("newaccount"),
 		Authorization: []eos.PermissionLevel{
-			{eos.AccountName("eosio"), eos.PermissionName("active")},
+			{
+				Actor:      eos.AccountName("eosio"),
+				Permission: eos.PermissionName("active"),
+			},
 		},
 		ActionData: eos.NewActionData(NewAccount{
 			Creator: eos.AccountName("eosio"),
@@ -120,7 +129,10 @@ func TestMarshalTransactionAndPack(t *testing.T) {
 		Account: eos.AccountName("eosio"),
 		Name:    eos.ActionName("transfer"),
 		Authorization: []eos.PermissionLevel{
-			{eos.AccountName("eosio"), eos.PermissionName("active")},
+			{
+				Actor:      eos.AccountName("eosio"),
+				Permission: eos.PermissionName("active"),
+			},
 		},
 		ActionData: eos.NewActionData(NewAccount{
 			Creator: eos.AccountName("eosio"),

diff --git a/system/setcode.go b/system/setcode.go
@@ -32,7 +32,10 @@ func NewSetCode(account eos.AccountName, wasmPath string) (out *eos.Action, err
 		Account: AN("eosio"),
 		Name:    ActN("setcode"),
 		Authorization: []eos.PermissionLevel{
-			{account, eos.PermissionName("active")},
+			{
+				Actor:      account,
+				Permission: eos.PermissionName("active"),
+			},
 		},
 		ActionData: eos.NewActionData(SetCode{
 			Account:   account,
@@ -66,7 +69,10 @@ func NewSetABI(account eos.AccountName, abiPath string) (out *eos.Action, err er
 		Account: AN("eosio"),
 		Name:    ActN("setabi"),
 		Authorization: []eos.PermissionLevel{
-			{account, eos.PermissionName("active")},
+			{
+				Actor:      account,
+				Permission: eos.PermissionName("active"),
+			},
 		},
 		ActionData: eos.NewActionData(SetABI{
 			Account: account,

diff --git a/system/setram.go b/system/setram.go
@@ -9,7 +9,10 @@ func NewSetRAM(maxRAMSize uint64) *eos.Action {
 		Account: AN("eosio"),
 		Name:    ActN("setram"),
 		Authorization: []eos.PermissionLevel{
-			{AN("eosio"), eos.PermissionName("active")},
+			{
+				Actor:      AN("eosio"),
+				Permission: eos.PermissionName("active"),
+			},
 		},
 		ActionData: eos.NewActionData(SetRAM{
 			MaxRAMSize: eos.Uint64(maxRAMSize),

diff --git a/system/setramrate.go b/system/setramrate.go
@@ -9,7 +9,10 @@ func NewSetRAMRate(bytesPerBlock uint16) *eos.Action {
 		Account: AN("eosio"),
 		Name:    ActN("setram"),
 		Authorization: []eos.PermissionLevel{
-			{AN("eosio"), eos.PermissionName("active")},
+			{
+				Actor:      AN("eosio"),
+				Permission: eos.PermissionName("active"),
+			},
 		},
 		ActionData: eos.NewActionData(SetRAMRate{
 			BytesPerBlock: bytesPerBlock,

diff --git a/system/unlinkauth.go b/system/unlinkauth.go
@@ -12,7 +12,10 @@ func NewUnlinkAuth(account, code eos.AccountName, actionName eos.ActionName) *eo
 		Account: AN("eosio"),
 		Name:    ActN("unlinkauth"),
 		Authorization: []eos.PermissionLevel{
-			{account, eos.PermissionName("active")},
+			{
+				Actor:      account,
+				Permission: eos.PermissionName("active"),
+			},
 		},
 		ActionData: eos.NewActionData(UnlinkAuth{
 			Account: account,

diff --git a/system/updateauth.go b/system/updateauth.go
@@ -12,7 +12,10 @@ func NewUpdateAuth(account eos.AccountName, permission, parent eos.PermissionNam
 		Account: AN("eosio"),
 		Name:    ActN("updateauth"),
 		Authorization: []eos.PermissionLevel{
-			{account, usingPermission},
+			{
+				Actor:      account,
+				Permission: usingPermission,
+			},
 		},
 		ActionData: eos.NewActionData(UpdateAuth{
 			Account:    account,