From b3002e97a431aec0407d78e54e54a592524d906f Mon Sep 17 00:00:00 2001
From: rongyi <rongyi@onchain.com>
Date: Wed, 26 Aug 2020 15:09:13 +0800
Subject: [PATCH] Fix some small typo and convention

---
 identity.go             |  8 +++-----
 native_contract_test.go |  1 -
 ont_sdk.go              | 17 ++++++++---------
 wallet.go               |  8 ++++----
 wasmvm_contract.go      |  3 +++
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/identity.go b/identity.go
index 116a3f7..19ce0c6 100644
--- a/identity.go
+++ b/identity.go
@@ -70,7 +70,7 @@ func (this *Controller) GetSigScheme() s.SignatureScheme {
 
 type ControllerData struct {
 	ID     string `json:"id"`
-	Public string `json:"publicKey,omitemtpy"`
+	Public string `json:"publicKey,omitempty"`
 	SigSch string `json:"signatureScheme"`
 	keypair.ProtectedKey
 	scrypt *keypair.ScryptParam
@@ -422,10 +422,8 @@ func VerifyID(id string) bool {
 	data := buf[:pos]
 	check := buf[pos:]
 	sum := checksum(data)
-	if !bytes.Equal(sum, check) {
-		return false
-	}
-	return true
+
+	return bytes.Equal(sum, check)
 }
 
 func checksum(data []byte) []byte {
diff --git a/native_contract_test.go b/native_contract_test.go
index c08b9a5..8963851 100644
--- a/native_contract_test.go
+++ b/native_contract_test.go
@@ -61,5 +61,4 @@ func TestOntId(t *testing.T) {
 		return
 	}
 	fmt.Printf("TestOntId GetDocumentJson:%+v\n", string(document))
-	return
 }
diff --git a/ont_sdk.go b/ont_sdk.go
index 27fe49d..0f17112 100644
--- a/ont_sdk.go
+++ b/ont_sdk.go
@@ -35,7 +35,6 @@ import (
 	common3 "github.com/ontio/ontology-go-sdk/common"
 	"github.com/ontio/ontology-go-sdk/utils"
 	"github.com/ontio/ontology/common"
-	common2 "github.com/ontio/ontology/common"
 	"github.com/ontio/ontology/common/constants"
 	"github.com/ontio/ontology/core/payload"
 	"github.com/ontio/ontology/core/types"
@@ -79,7 +78,7 @@ func NewLayer2Sdk() *Layer2Sdk {
 	sdk.ChainId = common3.LAYER2_SYSTEM_ID
 	layer2Client := client.NewLayer2ClientMgr(&sdk.ClientMgr)
 	return &Layer2Sdk{
-		OntologySdk: sdk,
+		OntologySdk:     sdk,
 		Layer2ClientMgr: layer2Client,
 	}
 }
@@ -323,7 +322,7 @@ func isEnd(source *common.ZeroCopySource) (bool, error) {
 	}
 }
 
-func readAddress(source *common.ZeroCopySource) (common2.Address, error) {
+func readAddress(source *common.ZeroCopySource) (common.Address, error) {
 	senderBytes, _, irregular, eof := source.NextVarBytes()
 	if irregular || eof {
 		return common.ADDRESS_EMPTY, io.ErrUnexpectedEOF
@@ -368,10 +367,10 @@ func (this *OntologySdk) GetPrivateKeyFromMnemonicCodesStrBip44(mnemonicCodesStr
 	if mnemonicCodesStr == "" {
 		return nil, fmt.Errorf("mnemonicCodesStr should not be nil")
 	}
-	//address_index
-	if index < 0 {
-		return nil, fmt.Errorf("index should be bigger than 0")
-	}
+	//address_index, u32 will never less than 0
+	// if index < 0 {
+	// 	return nil, fmt.Errorf("index should be bigger than 0")
+	// }
 	seed := bip39.NewSeed(mnemonicCodesStr, "")
 	masterKey, err := bip32.NewMasterKey(seed)
 	if err != nil {
@@ -404,7 +403,7 @@ func (this *OntologySdk) NewInvokeTransaction(gasPrice, gasLimit uint64, invokeC
 		TxType:   types.InvokeNeo,
 		Nonce:    rand.Uint32(),
 		Payload:  invokePayload,
-		Sigs:     make([]types.Sig, 0, 0),
+		Sigs:     make([]types.Sig, 0),
 	}
 	return tx
 }
@@ -508,7 +507,7 @@ func (this *OntologySdk) GetTxData(tx *types.MutableTransaction) (string, error)
 	if err != nil {
 		return "", fmt.Errorf("IntoImmutable error:%s", err)
 	}
-	sink := common2.ZeroCopySink{}
+	sink := common.ZeroCopySink{}
 	txData.Serialization(&sink)
 	rawtx := hex.EncodeToString(sink.Bytes())
 	return rawtx, nil
diff --git a/wallet.go b/wallet.go
index cd5347f..b039be5 100644
--- a/wallet.go
+++ b/wallet.go
@@ -630,9 +630,9 @@ func (this *Wallet) Save() error {
 	for _, identity := range this.identities {
 		walletData.Identities = append(walletData.Identities, identity.ToIdentityData())
 	}
-	for _, acc := range this.accounts {
-		walletData.Accounts = append(walletData.Accounts, acc)
-	}
+
+	walletData.Accounts = append(walletData.Accounts, this.accounts...)
+
 	this.lock.RUnlock()
 	return walletData.Save(this.path)
 }
@@ -653,7 +653,7 @@ func NewWalletData() *WalletData {
 		Scrypt:     keypair.GetScryptParameters(),
 		Identities: nil,
 		Extra:      "",
-		Accounts:   make([]*AccountData, 0, 0),
+		Accounts:   make([]*AccountData, 0),
 	}
 }
 
diff --git a/wasmvm_contract.go b/wasmvm_contract.go
index dff63bf..c61ffb4 100644
--- a/wasmvm_contract.go
+++ b/wasmvm_contract.go
@@ -55,6 +55,9 @@ func (this *WasmVMContract) DeployWasmVMSmartContract(
 		return common.UINT256_EMPTY, fmt.Errorf("code hex decode error:%s", err)
 	}
 	tx, err := utils2.NewDeployCodeTransaction(gasPrice, gasLimit, invokeCode, payload.WASMVM_TYPE, name, version, author, email, desc)
+	if err != nil {
+		return common.UINT256_EMPTY, fmt.Errorf("fail to create deploy tx: %v", err)
+	}
 	err = this.ontSdk.SignToTransaction(tx, singer)
 	if err != nil {
 		return common.Uint256{}, err