Skip to content

P
plugin
Commit 57808324 authored by heyubin's avatar heyubin
Browse files
Options

add by hybh for conflicts

parents 1727e318 1e0f7be7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 39 deletions
build/docker-compose.sh
View file @ 57808324
...@@ -102,6 +102,10 @@ function base_init() { ...@@ -102,6 +102,10 @@ function base_init() {
sed -i $sedfix 's/^nodeGroupFrozenCoins=.*/nodeGroupFrozenCoins=20/g' chain33.toml sed -i $sedfix 's/^nodeGroupFrozenCoins=.*/nodeGroupFrozenCoins=20/g' chain33.toml
sed -i $sedfix 's/^paraConsensusStopBlocks=.*/paraConsensusStopBlocks=100/g' chain33.toml sed -i $sedfix 's/^paraConsensusStopBlocks=.*/paraConsensusStopBlocks=100/g' chain33.toml
# blockchain
# TODO 剩下evm trade 测试和这个选项有关，在其他pr中解决，不使得这个pr太大
sed -i $sedfix 's/^enableReduceLocaldb=.*/enableReduceLocaldb=false/g' chain33.toml
# ticket # ticket
sed -i $sedfix 's/^ticketPrice =.*/ticketPrice = 10000/g' chain33.toml sed -i $sedfix 's/^ticketPrice =.*/ticketPrice = 10000/g' chain33.toml
...@@ -132,10 +136,10 @@ function start() { ...@@ -132,10 +136,10 @@ function start() {
${CLI} block last_header ${CLI} block last_header
${CLI} net info ${CLI} net info
${CLI} net peer_info ${CLI} net peer
local count=1000 local count=1000
while [ $count -gt 0 ]; do while [ $count -gt 0 ]; do
peersCount=$(${CLI} net peer_info | jq '.[] | length') peersCount=$(${CLI} net peer | jq '.[] | length')
if [ "${peersCount}" -ge 2 ]; then if [ "${peersCount}" -ge 2 ]; then
break break
fi fi
......
build/system-fork-test.sh
View file @ 57808324
...@@ -111,12 +111,12 @@ function start() { ...@@ -111,12 +111,12 @@ function start() {
${CLI} block last_header ${CLI} block last_header
${CLI} net info ${CLI} net info
${CLI} net peer_info ${CLI} net peer
peersCount=$(${CLI} net peer_info | jq '.[] | length') peersCount=$(${CLI} net peer | jq '.[] | length')
echo "${peersCount}" echo "${peersCount}"
if [ "${peersCount}" -lt 2 ]; then if [ "${peersCount}" -lt 2 ]; then
sleep 20 sleep 20
peersCount=$(${CLI} net peer_info | jq '.[] | length') peersCount=$(${CLI} net peer | jq '.[] | length')
echo "${peersCount}" echo "${peersCount}"
if [ "${peersCount}" -lt 2 ]; then if [ "${peersCount}" -lt 2 ]; then
echo "peers error" echo "peers error"
...@@ -738,7 +738,7 @@ function peersCount() { ...@@ -738,7 +738,7 @@ function peersCount() {
needCount=$3 needCount=$3
for ((i = 0; i < time; i++)); do for ((i = 0; i < time; i++)); do
peersCount=$($name net peer_info | jq '.[] | length') peersCount=$($name net peer | jq '.[] | length')
printf '查询节点 %s ,所需节点数 %d ,当前节点数 %s \n' "${name}" "${needCount}" "${peersCount}" printf '查询节点 %s ,所需节点数 %d ,当前节点数 %s \n' "${name}" "${needCount}" "${peersCount}"
if [ "${peersCount}" = "$needCount" ]; then if [ "${peersCount}" = "$needCount" ]; then
echo "============= 符合节点数要求 =============" echo "============= 符合节点数要求 ============="
...@@ -795,7 +795,7 @@ function checkBlockHashfun() { ...@@ -795,7 +795,7 @@ function checkBlockHashfun() {
fi fi
fi fi
peersCount=0 peersCount=0
peersCount=$(${forkContainers[0]} net peer_info | jq '.[] | length') peersCount=$(${forkContainers[0]} net peer | jq '.[] | length')
printf '第 %d 次，未查询到网络同步，当前节点数 %d 个，100s后查询\n' $j "${peersCount}" printf '第 %d 次，未查询到网络同步，当前节点数 %d 个，100s后查询\n' $j "${peersCount}"
sleep 100 sleep 100
#检查是否超过了最大检测次数 #检查是否超过了最大检测次数
......
go.mod
View file @ 57808324
...@@ -6,6 +6,7 @@ require ( ...@@ -6,6 +6,7 @@ require (
github.com/33cn/chain33 v0.0.0-20200108042336-2dda2dfb7e0e github.com/33cn/chain33 v0.0.0-20200108042336-2dda2dfb7e0e
github.com/BurntSushi/toml v0.3.1 github.com/BurntSushi/toml v0.3.1
github.com/NebulousLabs/Sia v1.3.7 github.com/NebulousLabs/Sia v1.3.7
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd v0.0.0-20181013004428-67e573d211ac github.com/btcsuite/btcd v0.0.0-20181013004428-67e573d211ac
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d // indirect github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d // indirect
...@@ -16,14 +17,14 @@ require ( ...@@ -16,14 +17,14 @@ require (
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew v1.1.1
github.com/gogo/protobuf v1.3.0
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
github.com/golang/protobuf v1.3.2 github.com/golang/protobuf v1.2.0
github.com/hashicorp/golang-lru v0.5.0 github.com/hashicorp/golang-lru v0.5.0
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/pkg/errors v0.8.0 github.com/pkg/errors v0.8.0
github.com/prometheus/client_golang v1.1.0 // indirect github.com/prometheus/client_golang v0.9.2 // indirect
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
github.com/prometheus/common v0.4.1 // indirect
github.com/prometheus/procfs v0.0.3 // indirect
github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d
github.com/rs/cors v1.6.0 github.com/rs/cors v1.6.0
github.com/spf13/cobra v0.0.3 github.com/spf13/cobra v0.0.3
......
go.sum
View file @ 57808324
This diff is collapsed.
plugin/consensus/raft/block.go
View file @ 57808324
...@@ -209,7 +209,7 @@ func (client *Client) CreateBlock() { ...@@ -209,7 +209,7 @@ func (client *Client) CreateBlock() {
// 向raft底层发送block // 向raft底层发送block
func (client *Client) propose(block *types.Block) { func (client *Client) propose(block *types.Block) {
client.proposeC <- block client.proposeC <- block.Clone()
} }
// 从receive channel中读leader发来的block // 从receive channel中读leader发来的block
......
plugin/consensus/tendermint/store.go
View file @ 57808324
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
dbm "github.com/33cn/chain33/common/db" dbm "github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
tmtypes "github.com/33cn/plugin/plugin/dapp/valnode/types" tmtypes "github.com/33cn/plugin/plugin/dapp/valnode/types"
"github.com/gogo/protobuf/proto" "github.com/golang/protobuf/proto"
) )
var ( var (
......
plugin/dapp/guess/commands/game_test.go
View file @ 57808324
...@@ -41,6 +41,9 @@ import ( ...@@ -41,6 +41,9 @@ import (
var ( var (
secp crypto.Crypto secp crypto.Crypto
jrpcURL = "127.0.0.1:8803"
grpcURL = "127.0.0.1:8804"
config = `# Title为local，表示此配置文件为本地单节点的配置。此时本地节点所在的链上只有这一个节点，共识模块一般采用solo模式。 config = `# Title为local，表示此配置文件为本地单节点的配置。此时本地节点所在的链上只有这一个节点，共识模块一般采用solo模式。
Title="local" Title="local"
TestNet=true TestNet=true
...@@ -119,9 +122,9 @@ verMix=200 ...@@ -119,9 +122,9 @@ verMix=200
verMax=200 verMax=200
[rpc] [rpc]
# jrpc绑定地址 # jrpc绑定地址
jrpcBindAddr="localhost:8801" jrpcBindAddr="localhost:8803"
# grpc绑定地址 # grpc绑定地址
grpcBindAddr="localhost:8802" grpcBindAddr="localhost:8804"
# 白名单列表，允许访问的IP地址，默认是“*”，允许所有IP访问 # 白名单列表，允许访问的IP地址，默认是“*”，允许所有IP访问
whitelist=["127.0.0.1"] whitelist=["127.0.0.1"]
# jrpc方法请求白名单，默认是“*”，允许访问所有RPC方法 # jrpc方法请求白名单，默认是“*”，允许访问所有RPC方法
...@@ -476,7 +479,7 @@ func initEnvGuess() (queue.Queue, *blockchain.BlockChain, queue.Module, queue.Mo ...@@ -476,7 +479,7 @@ func initEnvGuess() (queue.Queue, *blockchain.BlockChain, queue.Module, queue.Mo
func createConn() error { func createConn() error {
var err error var err error
url := "127.0.0.1:8802" url := grpcURL
fmt.Println("grpc url:", url) fmt.Println("grpc url:", url)
conn, err = grpc.Dial(url, grpc.WithInsecure()) conn, err = grpc.Dial(url, grpc.WithInsecure())
if err != nil { if err != nil {
...@@ -632,47 +635,47 @@ func testCmd(cmd *cobra.Command) { ...@@ -632,47 +635,47 @@ func testCmd(cmd *cobra.Command) {
rootCmd.PersistentFlags().String("title", chain33Cfg.GetTitle(), "get title name") rootCmd.PersistentFlags().String("title", chain33Cfg.GetTitle(), "get title name")
rootCmd.PersistentFlags().String("rpc_laddr", "http://127.0.0.1:8802", "http url") rootCmd.PersistentFlags().String("rpc_laddr", "http://"+grpcURL, "http url")
rootCmd.AddCommand(cmd) rootCmd.AddCommand(cmd)
rootCmd.SetArgs([]string{"guess", "start", "--topic", "WorldCup Final", "--options", "A:France;B:Claodia", "--category", "football", "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "start", "--topic", "WorldCup Final", "--options", "A:France;B:Claodia", "--category", "football", "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
strGameID := "0x20d78aabfa67701f7492261312575614f684b084efa2c13224f1505706c846e8" strGameID := "0x20d78aabfa67701f7492261312575614f684b084efa2c13224f1505706c846e8"
rootCmd.SetArgs([]string{"guess", "bet", "--gameId", strGameID, "--option", "A", "--betsNumber", "500000000", "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "bet", "--gameId", strGameID, "--option", "A", "--betsNumber", "500000000", "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"guess", "stop", "--gameId", strGameID, "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "stop", "--gameId", strGameID, "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"guess", "abort", "--gameId", strGameID, "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "abort", "--gameId", strGameID, "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"guess", "publish", "--gameId", strGameID, "--result", "A", "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "publish", "--gameId", strGameID, "--result", "A", "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"guess", "query", "--type", "ids", "--gameIDs", strGameID, "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "query", "--type", "ids", "--gameIDs", strGameID, "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"guess", "query", "--type", "id", "--gameId", strGameID, "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "query", "--type", "id", "--gameId", strGameID, "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"guess", "query", "--type", "addr", "--addr", userAAddr, "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "query", "--type", "addr", "--addr", userAAddr, "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"guess", "query", "--type", "status", "--status", "10", "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "query", "--type", "status", "--status", "10", "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"guess", "query", "--type", "adminAddr", "--adminAddr", adminAddr, "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "query", "--type", "adminAddr", "--adminAddr", adminAddr, "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"guess", "query", "--type", "addrStatus", "--addr", userAAddr, "--status", "11", "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "query", "--type", "addrStatus", "--addr", userAAddr, "--status", "11", "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"guess", "query", "--type", "adminStatus", "--adminAddr", adminAddr, "--status", "11", "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "query", "--type", "adminStatus", "--adminAddr", adminAddr, "--status", "11", "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"guess", "query", "--type", "categoryStatus", "--category", "football", "--status", "11", "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"guess", "query", "--type", "categoryStatus", "--category", "football", "--status", "11", "--rpc_laddr", "http://" + jrpcURL})
rootCmd.Execute() rootCmd.Execute()
} }
plugin/dapp/privacy/cmd/test/fork-test.sh
View file @ 57808324
...@@ -100,7 +100,7 @@ function peersCount() { ...@@ -100,7 +100,7 @@ function peersCount() {
sleepTime=15 sleepTime=15
for ((i = 0; i < retryTime; i++)); do for ((i = 0; i < retryTime; i++)); do
peersCount=$($name net peer_info | jq '.[] | length') peersCount=$($name net peer | jq '.[] | length')
printf '查询节点 %s ,所需节点数 %d ,当前节点数 %s \n' "${name}" "${needCount}" "${peersCount}" printf '查询节点 %s ,所需节点数 %d ,当前节点数 %s \n' "${name}" "${needCount}" "${peersCount}"
if [ "${peersCount}" = "$needCount" ]; then if [ "${peersCount}" = "$needCount" ]; then
echo "============= 符合节点数要求 =============" echo "============= 符合节点数要求 ============="
......
plugin/dapp/relay/executor/relaydb_test.go
View file @ 57808324
...@@ -15,7 +15,7 @@ import ( ...@@ -15,7 +15,7 @@ import (
"github.com/33cn/chain33/common/db/mocks" "github.com/33cn/chain33/common/db/mocks"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
ty "github.com/33cn/plugin/plugin/dapp/relay/types" ty "github.com/33cn/plugin/plugin/dapp/relay/types"
"github.com/gogo/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
) )
......
plugin/dapp/storage/executor/storagedb.go
View file @ 57808324
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
dbm "github.com/33cn/chain33/common/db" dbm "github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
storagetypes "github.com/33cn/plugin/plugin/dapp/storage/types" storagetypes "github.com/33cn/plugin/plugin/dapp/storage/types"
"github.com/gogo/protobuf/proto" "github.com/golang/protobuf/proto"
) )
type StorageAction struct { type StorageAction struct {
......
plugin/dapp/unfreeze/cmd/test/test-rpc.sh
View file @ 57808324
...@@ -25,9 +25,7 @@ function query_unfreezeID() { ...@@ -25,9 +25,7 @@ function query_unfreezeID() {
exit 1 exit 1
fi fi
else else
unfreeze_id=$(jq '(.result.receipt.logs['"$uid_index"'].log.current.unfreezeID)' <<<"$ret") uid=${tx#0x}
unfreeze_id2=${unfreeze_id#\"mavl-unfreeze-}
uid=${unfreeze_id2%\"}
echo -e "${GRE}====query tx=$txhash success${NOC}" echo -e "${GRE}====query tx=$txhash success${NOC}"
break break
fi fi
...@@ -38,7 +36,6 @@ function init() { ...@@ -38,7 +36,6 @@ function init() {
ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")') ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
echo "ipara=$ispara" echo "ipara=$ispara"
exec_name="unfreeze" exec_name="unfreeze"
uid_index=2
symbol="bty" symbol="bty"
beneficiary_key=0xa2ec1c6274723c021daa8792f4d0d52ffa0eff0fd47c9c6c1d1dd618762dc178 beneficiary_key=0xa2ec1c6274723c021daa8792f4d0d52ffa0eff0fd47c9c6c1d1dd618762dc178
...@@ -55,7 +52,6 @@ function init() { ...@@ -55,7 +52,6 @@ function init() {
if [ "$ispara" == true ]; then if [ "$ispara" == true ]; then
exec_name="user.p.para."${exec_name} exec_name="user.p.para."${exec_name}
uid_index=1
symbol="para" symbol="para"
local main_ip=${MAIN_HTTP//8901/8801} local main_ip=${MAIN_HTTP//8901/8801}
......
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