Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
c7177ec0
Y
YTBP
项目概览
YottaChain
/
YTBP
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
YTBP
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c7177ec0
编写于
7月 11, 2018
作者:
B
Brian Johnson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added exitOnError processing to delegatebw, regproducer, and vote.
上级
d6362c6c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
18 deletion
+12
-18
tests/Node.py
tests/Node.py
+9
-6
tests/nodeos_voting_test.py
tests/nodeos_voting_test.py
+3
-12
未找到文件。
tests/Node.py
浏览文件 @
c7177ec0
...
...
@@ -836,7 +836,7 @@ class Node(object):
return
None
return
trans
def
delegatebw
(
self
,
fromAccount
,
netQuantity
,
cpuQuantity
,
toAccount
=
None
,
transferTo
=
False
,
waitForTransBlock
=
False
):
def
delegatebw
(
self
,
fromAccount
,
netQuantity
,
cpuQuantity
,
toAccount
=
None
,
transferTo
=
False
,
waitForTransBlock
=
False
,
exitOnError
=
False
):
if
toAccount
is
None
:
toAccount
=
fromAccount
...
...
@@ -844,29 +844,32 @@ class Node(object):
transferStr
=
"--transfer"
if
transferTo
else
""
cmd
=
"%s -j %s %s
\"
%s %s
\"
\"
%s %s
\"
%s"
%
(
cmdDesc
,
fromAccount
.
name
,
toAccount
.
name
,
netQuantity
,
CORE_SYMBOL
,
cpuQuantity
,
CORE_SYMBOL
,
transferStr
)
trans
=
self
.
processCmd
(
cmd
,
cmdDesc
,
waitForTransBlock
)
msg
=
"fromAccount=%s, toAccount=%s"
%
(
fromAccount
.
name
,
toAccount
.
name
);
trans
=
self
.
processCmd
(
cmd
,
cmdDesc
,
waitForTransBlock
,
exitOnError
=
exitOnError
,
exitMsg
=
msg
)
transId
=
Node
.
getTransId
(
trans
)
if
waitForTransBlock
and
not
self
.
waitForTransInBlock
(
transId
):
return
None
return
trans
def
regproducer
(
self
,
producer
,
url
,
location
,
waitForTransBlock
=
False
):
def
regproducer
(
self
,
producer
,
url
,
location
,
waitForTransBlock
=
False
,
exitOnError
=
False
):
cmdDesc
=
"system regproducer"
cmd
=
"%s -j %s %s %s %s"
%
(
cmdDesc
,
producer
.
name
,
producer
.
activePublicKey
,
url
,
location
)
trans
=
self
.
processCmd
(
cmd
,
cmdDesc
,
waitForTransBlock
)
msg
=
"producer=%s"
%
(
producer
.
name
);
trans
=
self
.
processCmd
(
cmd
,
cmdDesc
,
waitForTransBlock
,
exitOnError
=
exitOnError
,
exitMsg
=
msg
)
transId
=
Node
.
getTransId
(
trans
)
if
waitForTransBlock
and
not
self
.
waitForTransInBlock
(
transId
):
return
None
return
trans
def
vote
(
self
,
account
,
producers
,
waitForTransBlock
=
False
):
def
vote
(
self
,
account
,
producers
,
waitForTransBlock
=
False
,
exitOnError
=
False
):
cmdDesc
=
"system voteproducer prods"
cmd
=
"%s -j %s %s"
%
(
cmdDesc
,
account
.
name
,
" "
.
join
(
producers
))
trans
=
self
.
processCmd
(
cmd
,
cmdDesc
,
waitForTransBlock
)
msg
=
"account=%s, producers=[ %s ]"
%
(
account
.
name
,
", "
.
join
(
producers
));
trans
=
self
.
processCmd
(
cmd
,
cmdDesc
,
waitForTransBlock
,
exitOnError
=
exitOnError
,
exitMsg
=
msg
)
transId
=
Node
.
getTransId
(
trans
)
if
waitForTransBlock
and
not
self
.
waitForTransInBlock
(
transId
):
...
...
tests/nodeos_voting_test.py
浏览文件 @
c7177ec0
...
...
@@ -27,10 +27,7 @@ class ProducerToNode:
def
vote
(
node
,
account
,
producers
):
Print
(
"Votes for %s"
%
(
account
.
name
))
trans
=
node
.
vote
(
account
,
producers
,
waitForTransBlock
=
False
)
if
trans
is
None
:
Utils
.
cmdError
(
"voting with %s"
%
(
account
.
name
))
errorExit
(
"Failed to vote with account %s"
%
(
account
.
name
))
trans
=
node
.
vote
(
account
,
producers
,
waitForTransBlock
=
False
,
exitOnError
=
True
)
return
trans
def
getBlockProducer
(
node
,
blockNum
):
...
...
@@ -250,10 +247,7 @@ try:
node
=
cluster
.
getNode
(
i
)
node
.
producers
=
Cluster
.
parseProducers
(
i
)
for
prod
in
node
.
producers
:
trans
=
node
.
regproducer
(
cluster
.
defProducerAccounts
[
prod
],
"http::/mysite.com"
,
0
,
waitForTransBlock
=
False
)
if
trans
is
None
:
Utils
.
cmdError
(
"registering producer %s"
%
(
prod
.
name
))
errorExit
(
"Failed registering producer %s"
%
(
prod
.
name
))
trans
=
node
.
regproducer
(
cluster
.
defProducerAccounts
[
prod
],
"http::/mysite.com"
,
0
,
waitForTransBlock
=
False
,
exitOnError
=
True
)
node0
=
cluster
.
getNode
(
0
)
if
node0
is
None
:
...
...
@@ -278,10 +272,7 @@ try:
if
node
.
transferFunds
(
cluster
.
eosioAccount
,
account
,
transferAmount
,
"test transfer"
)
is
None
:
errorExit
(
"Failed to transfer funds %d from account %s to %s"
%
(
transferAmount
,
cluster
.
eosioAccount
.
name
,
account
.
name
))
trans
=
node
.
delegatebw
(
account
,
20000000.0000
,
20000000.0000
)
if
trans
is
None
:
Utils
.
cmdError
(
"delegate bandwidth for %s"
%
(
account
.
name
))
errorExit
(
"Failed to delegate bandwidth for %s"
%
(
account
.
name
))
trans
=
node
.
delegatebw
(
account
,
20000000.0000
,
20000000.0000
,
exitOnError
=
True
)
# containers for tracking producers
prodsActive
=
{}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录