update proto.version

plugin/dapp/accountmanager/executor/account_test.go

@@ -185,10 +185,10 @@ func TestAccountManager(t *testing.T) {
 	assert.Equal(t, balance.Balance, 199*types.Coin)
 
 	//过期账户查询
-	time.Sleep(10 * time.Second)
+	time.Sleep(11 * time.Second)
 	accounts, err = Exec_QueryExpiredAccounts(time.Now().Unix(), stateDB, kvdb)
 	assert.Equal(t, err, nil)
-	assert.Equal(t, accounts.Accounts[0].AccountID, "harrylee2015")
+	assert.Equal(t, 2, len(accounts.Accounts))
 	//账户延期
 	tx10, _ := CreateSupervise(&et.Supervise{
 		AccountIDs: []string{"harrylee2015"},
@@ -198,7 +198,7 @@ func TestAccountManager(t *testing.T) {
 	assert.Equal(t, err, nil)
 	accounts, err = Exec_QueryExpiredAccounts(time.Now().Unix(), stateDB, kvdb)
 	assert.Equal(t, err, nil)
-	assert.Equal(t, len(accounts.Accounts), 0)
+	assert.Equal(t, 1, len(accounts.Accounts))
 	//账户授权
 	tx11, _ := CreateSupervise(&et.Supervise{
 		AccountIDs: []string{"harrylee2015"},

plugin/dapp/accountmanager/executor/accountdb.go

@@ -427,7 +427,7 @@ func findAccountByAddr(localdb dbm.KV, addr string) (*et.Account, error) {
 	//第一次查询,默认展示最新得成交记录
 	rows, err := table.ListIndex("addr", prefix, nil, 1, et.ListDESC)
 	if err != nil {
-		elog.Error("findAccountByAddr.", "prefix", prefix, "err", err.Error())
+		elog.Error("findAccountByAddr.", "addr", addr, "err", err.Error())
 		return nil, err
 	}
 	for _, row := range rows {

plugin/dapp/accountmanager/executor/accountmanager.go

@@ -60,7 +60,10 @@ func (a *Accountmanager) ExecutorOrder() int64 {
 func (a *Accountmanager) CheckTx(tx *types.Transaction, index int) error {
 	//发送交易的时候就检查payload,做严格的参数检查
 	var ama et.AccountmanagerAction
-	types.Decode(tx.GetPayload(), &ama)
+	err := types.Decode(tx.GetPayload(), &ama)
+	if err != nil {
+		return err
+	}
 	switch ama.Ty {
 	case et.TyRegisterAction:
 		register := ama.GetRegister()

plugin/dapp/accountmanager/executor/tables_test.go

@@ -13,8 +13,8 @@ func TestAccountTable(t *testing.T) {
 	_, _, kvdb := util.CreateTestDB()
 	table := NewAccountTable(kvdb)
 	now := time.Now().Unix()
-	row1 := &et.Account{Index: now * int64(types.MaxTxsPerBlock), AccountID: "harry2015", Status: 1, ExpireTime: now + 10, Addr: "xxxx"}
-	row2 := &et.Account{Index: now*int64(types.MaxTxsPerBlock) + 1, AccountID: "harry2020", Status: 1, ExpireTime: now, Addr: "xxxx"}
+	row1 := &et.Account{Index: now * int64(types.MaxTxsPerBlock), AccountID: "harry2015", Status: 0, ExpireTime: now + 10, Addr: "xxxx"}
+	row2 := &et.Account{Index: now*int64(types.MaxTxsPerBlock) + 1, AccountID: "harry2020", Status: 0, ExpireTime: now, Addr: "xxxx"}
 	table.Add(row1)
 	table.Add(row2)
 	kvs, err := table.Save()