Skip to content

P
plugin
Commit f5cffa17 authored by liuyuhang's avatar liuyuhang
Browse files
Options

add paracross test

parent 5220aba0
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 25 deletions
plugin/dapp/autonomy/cmd/test/test-rpc.sh
View file @ f5cffa17
...@@ -7,6 +7,8 @@ MAIN_HTTP="" ...@@ -7,6 +7,8 @@ MAIN_HTTP=""
EXECTOR="" EXECTOR=""
EXECTOR_ADDR="" EXECTOR_ADDR=""
TICKET_EXECTOR=""
TICKET_ADDR=""
propKey="0xfd0c4a8a1efcd221ee0f36b7d4f57d8ff843cb8bc193b39c7863332d355acafa" propKey="0xfd0c4a8a1efcd221ee0f36b7d4f57d8ff843cb8bc193b39c7863332d355acafa"
propAddr="15VUiygdxMSZ3rykwe742yomp2cPJ9Tfve" propAddr="15VUiygdxMSZ3rykwe742yomp2cPJ9Tfve"
...@@ -85,7 +87,11 @@ boards=' ...@@ -85,7 +87,11 @@ boards='
"'${boardsAddr[19]}'", "'${boardsAddr[19]}'",
"'${boardsAddr[20]}'" "'${boardsAddr[20]}'"
' '
chain33_para_init() {
ip=$1
chain33_ImportPrivkey "${votePrKey}" "${voteAddr}" "autonomytest" "${ip}"
chain33_SendToAddress "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv" "$voteAddr" 630000000000 "${ip}"
}
chain33_applyCoinsNOLimit() { chain33_applyCoinsNOLimit() {
echo "chain33_getMainChainCoins" echo "chain33_getMainChainCoins"
if [ "$#" -lt 3 ]; then if [ "$#" -lt 3 ]; then
...@@ -101,13 +107,13 @@ chain33_applyCoinsNOLimit() { ...@@ -101,13 +107,13 @@ chain33_applyCoinsNOLimit() {
} }
handleBoards() { handleBoards() {
local main_ip=${MAIN_HTTP//8901/8801} local ip=$1
chain33_ImportPrivkey "${propKey}" "${propAddr}" "prop" "${main_ip}" #chain33_ImportPrivkey "${propKey}" "${propAddr}" "prop" "${main_ip}"
for ((i = 0; i < ${#boardsPrKey[*]}; i++)); do for ((i = 0; i < ${#boardsPrKey[*]}; i++)); do
echo "${boardsPrKey[$i]}" echo "${boardsPrKey[$i]}"
lab="board_"${i} lab="board_"${i}
chain33_ImportPrivkey "${boardsPrKey[$i]}" "${boardsAddr[$i]}" "${lab}" "${main_ip}" chain33_ImportPrivkey "${boardsPrKey[$i]}" "${boardsAddr[$i]}" "${lab}" "${ip}"
chain33_applyCoins "${boardsAddr[$i]}" 100000000 "${main_ip}" chain33_applyCoins "${boardsAddr[$i]}" 100000000 "${ip}"
done done
} }
...@@ -140,7 +146,7 @@ revokeProposalTx() { ...@@ -140,7 +146,7 @@ revokeProposalTx() {
local req='{"method":"Chain33.CreateTransaction","params":[{"execer":"'"${EXECTOR}"'", "actionName":"'"${funcName}"'", "payload":{"proposalID": "'"${ID}"'"}}]}' local req='{"method":"Chain33.CreateTransaction","params":[{"execer":"'"${EXECTOR}"'", "actionName":"'"${funcName}"'", "payload":{"proposalID": "'"${ID}"'"}}]}'
echo "${req}" echo "${req}"
chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result" chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
chain33_SignAndSendTx "${RETURN_RESP}" "${privk}" "${MAIN_HTTP}" chain33_SignAndSendTx "${RETURN_RESP}" "${propKey}" "${MAIN_HTTP}"
echo $RAW_TX_HASH echo $RAW_TX_HASH
echo_rst "revoke Proposal $funcName query_tx" "$?" echo_rst "revoke Proposal $funcName query_tx" "$?"
} }
...@@ -151,7 +157,7 @@ terminateProposalTx() { ...@@ -151,7 +157,7 @@ terminateProposalTx() {
local req='{"method":"Chain33.CreateTransaction","params":[{"execer":"'"${EXECTOR}"'", "actionName":"'"${funcName}"'", "payload":{"proposalID": "'"${ID}"'"}}]}' local req='{"method":"Chain33.CreateTransaction","params":[{"execer":"'"${EXECTOR}"'", "actionName":"'"${funcName}"'", "payload":{"proposalID": "'"${ID}"'"}}]}'
echo "${req}" echo "${req}"
chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result" chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
chain33_SignAndSendTx "${RETURN_RESP}" "${privk}" "${MAIN_HTTP}" chain33_SignAndSendTx "${RETURN_RESP}" "${propKey}" "${MAIN_HTTP}"
echo $RAW_TX_HASH echo $RAW_TX_HASH
echo_rst "terminate Proposal $funcName query_tx" "$?" echo_rst "terminate Proposal $funcName query_tx" "$?"
} }
...@@ -201,6 +207,7 @@ testProposalBoard() { ...@@ -201,6 +207,7 @@ testProposalBoard() {
revokeProposalTx ${proposalID} "RvkPropBoard" revokeProposalTx ${proposalID} "RvkPropBoard"
terminateProposalTx ${proposalID} "TmintPropBoard" terminateProposalTx ${proposalID} "TmintPropBoard"
queryProposal ${proposalID} "GetProposalBoard" queryProposal ${proposalID} "GetProposalBoard"
listProposal 2 "ListProposalBoard"
} }
proposalRuleTx() { proposalRuleTx() {
...@@ -254,6 +261,7 @@ testProposalRule() { ...@@ -254,6 +261,7 @@ testProposalRule() {
revokeProposalTx ${proposalID} "RvkPropRule" revokeProposalTx ${proposalID} "RvkPropRule"
terminateProposalTx ${proposalID} "TmintPropRule" terminateProposalTx ${proposalID} "TmintPropRule"
queryProposal ${proposalID} "GetProposalRule" queryProposal ${proposalID} "GetProposalRule"
listProposal 2 "ListProposalRule"
} }
proposalProjectTx() { proposalProjectTx() {
...@@ -303,6 +311,7 @@ testProposalProject() { ...@@ -303,6 +311,7 @@ testProposalProject() {
revokeProposalTx ${proposalID} "RvkPropProject" revokeProposalTx ${proposalID} "RvkPropProject"
terminateProposalTx ${proposalID} "TmintPropProject" terminateProposalTx ${proposalID} "TmintPropProject"
queryProposal ${proposalID} "GetProposalProject" queryProposal ${proposalID} "GetProposalProject"
listProposal 2 "ListProposalProject"
} }
proposalChangeTx() { proposalChangeTx() {
...@@ -352,6 +361,7 @@ testProposalChange() { ...@@ -352,6 +361,7 @@ testProposalChange() {
revokeProposalTx ${proposalID} "RvkPropChange" revokeProposalTx ${proposalID} "RvkPropChange"
terminateProposalTx ${proposalID} "TmintPropChange" terminateProposalTx ${proposalID} "TmintPropChange"
queryProposal ${proposalID} "GetProposalChange" queryProposal ${proposalID} "GetProposalChange"
listProposal 2 "ListProposalChange"
} }
init() { init() {
...@@ -361,9 +371,13 @@ init() { ...@@ -361,9 +371,13 @@ init() {
if [ "$ispara" == true ]; then if [ "$ispara" == true ]; then
EXECTOR_ADDR=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"user.p.para.autonomy"}]}' ${MAIN_HTTP} | jq -r ".result") EXECTOR_ADDR=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"user.p.para.autonomy"}]}' ${MAIN_HTTP} | jq -r ".result")
EXECTOR="user.p.para.autonomy" EXECTOR="user.p.para.autonomy"
TICKET_ADDR=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"user.p.para.ticket"}]}' ${MAIN_HTTP} | jq -r ".result")
TICKET_EXECTOR="user.p.para.ticket"
else else
EXECTOR_ADDR=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"autonomy"}]}' ${MAIN_HTTP} | jq -r ".result") EXECTOR_ADDR=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"autonomy"}]}' ${MAIN_HTTP} | jq -r ".result")
EXECTOR="autonomy" EXECTOR="autonomy"
TICKET_ADDR=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"ticket"}]}' ${MAIN_HTTP} | jq -r ".result")
TICKET_EXECTOR="ticket"
fi fi
echo "EXECTOR_ADDR=$EXECTOR_ADDR" echo "EXECTOR_ADDR=$EXECTOR_ADDR"
...@@ -378,27 +392,31 @@ init() { ...@@ -378,27 +392,31 @@ init() {
else else
chain33_applyCoins "$propAddr" 1000000000 "${main_ip}" chain33_applyCoins "$propAddr" 1000000000 "${main_ip}"
chain33_QueryBalance "${propAddr}" "$main_ip" chain33_QueryBalance "${propAddr}" "$main_ip"
#主链投票账户转帐
handleBoards "$main_ip"
local para_ip="${MAIN_HTTP}" local para_ip="${MAIN_HTTP}"
chain33_ImportPrivkey "${propKey}" "${propAddr}" "prop" "$para_ip" chain33_ImportPrivkey "${propKey}" "${propAddr}" "prop" "$para_ip"
#平行链中账户转帐 #平行链中账户转帐
chain33_applyCoinsNOLimit "$propAddr" 100000000000 "${para_ip}" chain33_applyCoinsNOLimit "$propAddr" 100000000000 "$para_ip"
chain33_QueryBalance "${propAddr}" "$para_ip" chain33_QueryBalance "$propAddr" "$para_ip"
chain33_para_init "$para_ip"
fi fi
# 往合约中转 # 往合约中转
chain33_SendToAddress "$propAddr" "$EXECTOR_ADDR" 90000000000 "${MAIN_HTTP}" chain33_SendToAddress "$propAddr" "$EXECTOR_ADDR" 90000000000 "$MAIN_HTTP"
chain33_QueryExecBalance "${propAddr}" "autonomy" "$MAIN_HTTP" chain33_QueryExecBalance "$propAddr" "$EXECTOR" "$MAIN_HTTP"
# 往ticket合约中转帐 # 往ticket合约中转帐
chain33_SendToAddress "$voteAddr" "16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp" 300100000000 "${MAIN_HTTP}" chain33_SendToAddress "$voteAddr" "$TICKET_ADDR" 300100000000 "$MAIN_HTTP"
chain33_QueryExecBalance "$voteAddr" "16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp" "$MAIN_HTTP" chain33_QueryExecBalance "$voteAddr" "$TICKET_EXECTOR" "$MAIN_HTTP"
# 往投票账户中转帐
handleBoards "$MAIN_HTTP"
} }
function run_testcases() { function run_testcases() {
echo "run_testcases" echo "run_testcases"
handleBoards
testProposalRule testProposalRule
testProposalBoard testProposalBoard
testProposalProject testProposalProject
...@@ -411,11 +429,11 @@ function rpc_test() { ...@@ -411,11 +429,11 @@ function rpc_test() {
MAIN_HTTP="$1" MAIN_HTTP="$1"
echo "main_ip=$MAIN_HTTP" echo "main_ip=$MAIN_HTTP"
ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")') # ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
echo "ipara=$ispara" # echo "ipara=$ispara"
if [ "$ispara" == true ]; then # if [ "$ispara" == true ]; then
return 0 # return 0
fi # fi
init init
run_testcases run_testcases
...@@ -426,6 +444,4 @@ function rpc_test() { ...@@ -426,6 +444,4 @@ function rpc_test() {
chain33_debug_function rpc_test "$1" chain33_debug_function rpc_test "$1"
#chain33_debug_function rpc_test "http://127.0.0.1:8801" #chain33_debug_function rpc_test "http://127.0.0.1:8801"
\ No newline at end of file
#ImpBoards
\ No newline at end of file
plugin/dapp/autonomy/executor/autonomy.go
View file @ f5cffa17
...@@ -22,6 +22,7 @@ var ( ...@@ -22,6 +22,7 @@ var (
driverName = auty.AutonomyX driverName = auty.AutonomyX
autonomyAddr string autonomyAddr string
subcfg subConfig subcfg subConfig
ticketName = auty.TicketX
) )
// Init 重命名执行器名称 // Init 重命名执行器名称
...@@ -30,6 +31,7 @@ func Init(name string, cfg *types.Chain33Config, sub []byte) { ...@@ -30,6 +31,7 @@ func Init(name string, cfg *types.Chain33Config, sub []byte) {
types.MustDecode(sub, &subcfg) types.MustDecode(sub, &subcfg)
} }
autonomyAddr = address.ExecAddress(cfg.ExecName(auty.AutonomyX)) autonomyAddr = address.ExecAddress(cfg.ExecName(auty.AutonomyX))
ticketName = cfg.ExecName(auty.TicketX)
drivers.Register(cfg, GetName(), newAutonomy, cfg.GetDappFork(driverName, "Enable")) drivers.Register(cfg, GetName(), newAutonomy, cfg.GetDappFork(driverName, "Enable"))
InitExecType() InitExecType()
} }
......
plugin/dapp/autonomy/executor/boardaction.go
View file @ f5cffa17
...@@ -457,7 +457,7 @@ func (a *action) batchGetAddressVotes(addrs []string, height int64) (int32, erro ...@@ -457,7 +457,7 @@ func (a *action) batchGetAddressVotes(addrs []string, height int64) (int32, erro
} }
func (a *action) getAddressVotes(addr string, height int64) (int32, error) { func (a *action) getAddressVotes(addr string, height int64) (int32, error) {
account, err := a.getStartHeightVoteAccount(addr, auty.TicketX, height) account, err := a.getStartHeightVoteAccount(addr, ticketName, height)
if err != nil { if err != nil {
return 0, err return 0, err
} }
......
plugin/dapp/paracross/cmd/build/testcase.sh
View file @ f5cffa17
...@@ -61,7 +61,9 @@ function para_set_toml() { ...@@ -61,7 +61,9 @@ function para_set_toml() {
"1GCzJDS6HbgTQ2emade7mEJGGWFfA15pS9",\ "1GCzJDS6HbgTQ2emade7mEJGGWFfA15pS9",\
"1JYB8sxi4He5pZWHCd3Zi2nypQ4JMB6AxN",\ "1JYB8sxi4He5pZWHCd3Zi2nypQ4JMB6AxN",\
"12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",]/g' "${1}" "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",]/g' "${1}"
#autonomy
sed -i $sedfix 's/^useBalance=.*/useBalance=true/g' "${1}"
sed -i $sedfix 's/^total="16htvcBNS.*/total="1EZrEKPPC36SLRoLQBwLDjzcheiLRZJg49"/g' "${1}"
} }
function para_set_wallet() { function para_set_wallet() {
......
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