Commit 7b584343 authored by heyubin's avatar heyubin Committed by vipwzw

add by hyb for issues231

parent 7d3f70c1
...@@ -699,7 +699,6 @@ func parseAccInfo(view interface{}) (interface{}, error) { ...@@ -699,7 +699,6 @@ func parseAccInfo(view interface{}) (interface{}, error) {
for _, dailyLimit := range res.DailyLimits { for _, dailyLimit := range res.DailyLimits {
dailyLimt := strconv.FormatFloat(float64(dailyLimit.DailyLimit)/float64(types.Coin), 'f', 4, 64) dailyLimt := strconv.FormatFloat(float64(dailyLimit.DailyLimit)/float64(types.Coin), 'f', 4, 64)
spentToday := strconv.FormatFloat(float64(dailyLimit.SpentToday)/float64(types.Coin), 'f', 4, 64) spentToday := strconv.FormatFloat(float64(dailyLimit.SpentToday)/float64(types.Coin), 'f', 4, 64)
fmt.Println("parseAccInfo dailyLimt", dailyLimt)
dailyLimitResult := &mty.DailyLimitResult{ dailyLimitResult := &mty.DailyLimitResult{
Symbol: dailyLimit.Symbol, Symbol: dailyLimit.Symbol,
Execer: dailyLimit.Execer, Execer: dailyLimit.Execer,
......
...@@ -45,7 +45,7 @@ func (m *MultiSig) Query_MultiSigAccounts(in *mty.ReqMultiSigAccs) (types.Messag ...@@ -45,7 +45,7 @@ func (m *MultiSig) Query_MultiSigAccounts(in *mty.ReqMultiSigAccs) (types.Messag
if totalcount == 0 { if totalcount == 0 {
return accountAddrs, nil return accountAddrs, nil
} }
if in.End > totalcount { if in.End >= totalcount {
return nil, types.ErrInvalidParam return nil, types.ErrInvalidParam
} }
for index := in.Start; index <= in.End; index++ { for index := in.Start; index <= in.End; index++ {
......
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
package types package types
import ( import (
"strings"
"github.com/33cn/chain33/common/log/log15" "github.com/33cn/chain33/common/log/log15"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
) )
...@@ -125,13 +123,7 @@ func IsAssetsInvalid(exec, symbol string) error { ...@@ -125,13 +123,7 @@ func IsAssetsInvalid(exec, symbol string) error {
multisiglog.Error("IsAssetsInvalid", "exec", exec) multisiglog.Error("IsAssetsInvalid", "exec", exec)
return ErrInvalidExec return ErrInvalidExec
} }
//Symbol检测 //Symbol不做检测
symbolstr := strings.Split(symbol, ".")[len(strings.Split(symbol, "."))-1]
valid := validSymbol([]byte(symbolstr))
if !valid {
multisiglog.Error("IsAssetsInvalid", "symbol", symbol)
return ErrInvalidSymbol
}
return nil return nil
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment