Commit 64d7f9ee authored by mdj33's avatar mdj33 Committed by vipwzw

trim possible blank

parent bdbcf64d
...@@ -524,6 +524,10 @@ func (a *action) checkConfig(title string) error { ...@@ -524,6 +524,10 @@ func (a *action) checkConfig(title string) error {
} }
func getAddrGroup(addr string) []string { func getAddrGroup(addr string) []string {
addr = strings.Trim(addr, " ")
if addr == ""{
return nil
}
if strings.Contains(addr, ",") { if strings.Contains(addr, ",") {
repeats := make(map[string]bool) repeats := make(map[string]bool)
var addrs []string var addrs []string
...@@ -619,11 +623,12 @@ func (a *action) nodeGroupApply(config *pt.ParaNodeGroupConfig) (*types.Receipt, ...@@ -619,11 +623,12 @@ func (a *action) nodeGroupApply(config *pt.ParaNodeGroupConfig) (*types.Receipt,
} }
addrs := getAddrGroup(config.Addrs) addrs := getAddrGroup(config.Addrs)
receipt := &types.Receipt{Ty: types.ExecOk}
if len(addrs) == 0 { if len(addrs) == 0 {
clog.Error("node group apply addrs null", "addrs", config.Addrs) clog.Error("node group apply addrs null", "addrs", config.Addrs)
return nil, types.ErrInvalidParam return nil, types.ErrInvalidParam
} }
receipt := &types.Receipt{Ty: types.ExecOk}
//main chain //main chain
if !types.IsPara() { if !types.IsPara() {
r, err := a.nodeGroupCoinsFrozen(a.fromaddr, config.CoinsFrozen, int64(len(addrs))) r, err := a.nodeGroupCoinsFrozen(a.fromaddr, config.CoinsFrozen, int64(len(addrs)))
......
...@@ -306,3 +306,27 @@ func TestNodeManageSuite(t *testing.T) { ...@@ -306,3 +306,27 @@ func TestNodeManageSuite(t *testing.T) {
func (suite *NodeManageTestSuite) TearDownSuite() { func (suite *NodeManageTestSuite) TearDownSuite() {
} }
func TestGetAddrGroup(t *testing.T){
addrs := " 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4, 1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR, 1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k, ,,, 1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs , "
retAddrs:=getAddrGroup(addrs)
expectAddrs:=[]string{"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4","1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR","1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k","1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs"}
assert.Equal(t,expectAddrs,retAddrs)
addrs = " 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 , , "
retAddrs=getAddrGroup(addrs)
expectAddrs=[]string{"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}
assert.Equal(t,expectAddrs,retAddrs)
addrs = " , "
ret:=getAddrGroup(addrs)
assert.Equal(t,[]string(nil),ret)
assert.Equal(t,0,len(ret))
addrs = " "
ret=getAddrGroup(addrs)
assert.Equal(t,[]string(nil),ret)
assert.Equal(t,0,len(ret))
}
\ No newline at end of file
...@@ -7,6 +7,7 @@ package types ...@@ -7,6 +7,7 @@ package types
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"strings"
"github.com/33cn/chain33/common/address" "github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/common/log/log15" "github.com/33cn/chain33/common/log/log15"
...@@ -177,6 +178,7 @@ func createRawCommitTx(status *ParacrossNodeStatus, name string, fee int64) (*ty ...@@ -177,6 +178,7 @@ func createRawCommitTx(status *ParacrossNodeStatus, name string, fee int64) (*ty
// CreateRawNodeConfigTx create raw tx for node config // CreateRawNodeConfigTx create raw tx for node config
func CreateRawNodeConfigTx(config *ParaNodeAddrConfig) (*types.Transaction, error) { func CreateRawNodeConfigTx(config *ParaNodeAddrConfig) (*types.Transaction, error) {
config.Title = types.GetTitle() config.Title = types.GetTitle()
config.Addr = strings.Trim(config.Addr, " ")
action := &ParacrossAction{ action := &ParacrossAction{
Ty: ParacrossActionNodeConfig, Ty: ParacrossActionNodeConfig,
......
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