Skip to content

P
plugin
Commit 27f927d3 authored by madengji's avatar madengji Committed by 33cn
Browse files
Options

fix liner

parent 2f9fb12a
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 53 deletions
plugin/dapp/paracross/cmd/test/test-rpc.sh
View file @ 27f927d3
...@@ -523,7 +523,7 @@ paracross_testSelfConsensStages() { ...@@ -523,7 +523,7 @@ paracross_testSelfConsensStages() {
addr1q9="1Q9sQwothzM1gKSzkVZ8Dt1tqKX1uzSagx" addr1q9="1Q9sQwothzM1gKSzkVZ8Dt1tqKX1uzSagx"
priv1q9="0x1c3e6cac2f887e1ab9180e2d5772dc4ba01accb8d4df434faba097003eb35482" priv1q9="0x1c3e6cac2f887e1ab9180e2d5772dc4ba01accb8d4df434faba097003eb35482"
nodeAddr="1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"
paracross_testBind() { paracross_testBind() {
local para_ip=$1 local para_ip=$1
echo "bind miner" echo "bind miner"
...@@ -534,8 +534,8 @@ paracross_testBind() { ...@@ -534,8 +534,8 @@ paracross_testBind() {
chain33_SignAndSendTxWait "$rawtx" "${priv1q9}" "${para_ip}" chain33_SignAndSendTxWait "$rawtx" "${priv1q9}" "${para_ip}"
echo "2. get bind" echo "2. get bind"
chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"data":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' ${para_ip} '(.error|not) and (.result.List.SuperNode| [has("1KSBd17H7Z"),true])' "$FUNCNAME" '(.result.List)' chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"data":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' "${para_ip}" '(.error|not) and (.result.List.SuperNode| [has("1KSBd17H7Z"),true])' "$FUNCNAME" '(.result.List)'
chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"data":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' ${para_ip} '(.error|not) and (.result.List.Miners| [has("1Q9sQw"),true])' "$FUNCNAME" '(.result.List)' chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"data":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' "${para_ip}" '(.error|not) and (.result.List.Miners| [has("1Q9sQw"),true])' "$FUNCNAME" '(.result.List)'
} }
paracross_testUnBind() { paracross_testUnBind() {
...@@ -554,18 +554,18 @@ paracross_testUnBind() { ...@@ -554,18 +554,18 @@ paracross_testUnBind() {
# superNode=$(jq -r ".result.List.SuperNode" <<<"$resp") # superNode=$(jq -r ".result.List.SuperNode" <<<"$resp")
# miners=$(jq -r ".result.List.Miners" <<<"$resp") # miners=$(jq -r ".result.List.Miners" <<<"$resp")
chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"data":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' ${para_ip} '(.error|not) and (.result.List.SuperNode| [has("1KSBd17H7Z"),true])' "$FUNCNAME" '(.result.List)' chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"data":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' "${para_ip}" '(.error|not) and (.result.List.SuperNode| [has("1KSBd17H7Z"),true])' "$FUNCNAME" '(.result.List)'
chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"data":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' ${para_ip} '(.error|not) and (.result.List.Miners| [has("1Q9sQw"),false])' "$FUNCNAME" '(.result.List)' chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"data":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' "${para_ip}" '(.error|not) and (.result.List.Miners| [has("1Q9sQw"),false])' "$FUNCNAME" '(.result.List)'
} }
paracross_testBindMiner() { paracross_testBindMiner() {
#bind node #bind node
paracross_testBind $1 paracross_testBind "$1"
#unbind #unbind
paracross_testUnBind $1 paracross_testUnBind "$1"
#bind agin #bind agin
paracross_testBind $1 paracross_testBind "$1"
} }
function apply_coins() { function apply_coins() {
......
plugin/dapp/paracross/executor/reward_test.go
View file @ 27f927d3
...@@ -29,12 +29,6 @@ type RewardTestSuite struct { ...@@ -29,12 +29,6 @@ type RewardTestSuite struct {
action *action action *action
} }
//func init() {
// log.SetFileLog(nil)
// log.SetLogLevel("debug")
// Init(pt.ParaX, chain33TestCfg, nil)
//}
func (suite *RewardTestSuite) SetupSuite() { func (suite *RewardTestSuite) SetupSuite() {
suite.stateDB, _ = dbm.NewGoMemDB("state", "state", 1024) suite.stateDB, _ = dbm.NewGoMemDB("state", "state", 1024)
...@@ -53,42 +47,13 @@ func (suite *RewardTestSuite) SetupSuite() { ...@@ -53,42 +47,13 @@ func (suite *RewardTestSuite) SetupSuite() {
accountdb := suite.exec.GetCoinsAccount() accountdb := suite.exec.GetCoinsAccount()
suite.action = &action{coinsAccount: accountdb, db: suite.stateDB} suite.action = &action{coinsAccount: accountdb, db: suite.stateDB}
//// TODO, more fields
//// setup block
//blockDetail := &types.BlockDetail{
// Block: &types.Block{},
//}
//MainBlockHash10 = blockDetail.Block.Hash(chain33TestCfg)
//blockDetail.Block.MainHash = MainBlockHash10
//
//// setup title nodes : len = 4
//nodeConfigKey := calcManageConfigNodesKey(Title)
//nodeValue := makeNodeInfo(Title, Title, 4)
//suite.stateDB.Set(nodeConfigKey, types.Encode(nodeValue))
//value, err := suite.stateDB.Get(nodeConfigKey)
//if err != nil {
// suite.T().Error("get setup title failed", err)
// return
//}
//assert.Equal(suite.T(), value, types.Encode(nodeValue))
} }
//func (suite *RewardTestSuite) TestSetup() {
// nodeConfigKey := calcManageConfigNodesKey(Title)
// suite.T().Log(string(nodeConfigKey))
// _, err := suite.stateDB.Get(nodeConfigKey)
// if err != nil {
// suite.T().Error("get setup title failed", err)
// return
// }
//}
func TestRewardSuite(t *testing.T) { func TestRewardSuite(t *testing.T) {
suite.Run(t, new(RewardTestSuite)) suite.Run(t, new(RewardTestSuite))
} }
func (s *RewardTestSuite) TestRewardBindAddr() { func (suite *RewardTestSuite) TestRewardBindAddr() {
node := "1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4" node := "1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"
addr := "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY" addr := "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
key := calcParaBindMinerAddr(node, addr) key := calcParaBindMinerAddr(node, addr)
...@@ -101,22 +66,22 @@ func (s *RewardTestSuite) TestRewardBindAddr() { ...@@ -101,22 +66,22 @@ func (s *RewardTestSuite) TestRewardBindAddr() {
TargetNode: node, TargetNode: node,
} }
data := types.Encode(newer) data := types.Encode(newer)
s.stateDB.Set(key, data) suite.stateDB.Set(key, data)
rst, err := s.stateDB.Get(key) rst, err := suite.stateDB.Get(key)
if err != nil { if err != nil {
s.T().Error("get setup title failed", err) suite.T().Error("get setup title failed", err)
return return
} }
var info pt.ParaBindMinerInfo var info pt.ParaBindMinerInfo
types.Decode(rst, &info) types.Decode(rst, &info)
s.Equal(info.BindCoins, newer.BindCoins) suite.Equal(info.BindCoins, newer.BindCoins)
addr2 := "1PUiGcbsccfxW3zuvHXZBJfznziph5miAo" addr2 := "1PUiGcbsccfxW3zuvHXZBJfznziph5miAo"
new2 := *newer new2 := *newer
new2.Addr = addr2 new2.Addr = addr2
data = types.Encode(&new2) data = types.Encode(&new2)
key = calcParaBindMinerAddr(node, addr2) key = calcParaBindMinerAddr(node, addr2)
s.stateDB.Set(key, data) suite.stateDB.Set(key, data)
list := &pt.ParaNodeBindList{ list := &pt.ParaNodeBindList{
SuperNode: node, SuperNode: node,
...@@ -125,9 +90,9 @@ func (s *RewardTestSuite) TestRewardBindAddr() { ...@@ -125,9 +90,9 @@ func (s *RewardTestSuite) TestRewardBindAddr() {
lists := []*pt.ParaNodeBindList{list} lists := []*pt.ParaNodeBindList{list}
recp, change, err := s.action.rewardBindAddr(50000005, lists, 1) recp, change, err := suite.action.rewardBindAddr(50000005, lists, 1)
s.Nil(err) suite.Nil(err)
s.Equal(int64(5), change) suite.Equal(int64(5), change)
s.Equal(int32(types.ExecOk), recp.Ty) suite.Equal(int32(types.ExecOk), recp.Ty)
} }
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