Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
1e61b75c
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1e61b75c
编写于
3月 23, 2015
作者:
T
Taylor Gerring
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tests + fixes
上级
0330077d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
7 deletion
+37
-7
rpc/args.go
rpc/args.go
+4
-5
rpc/args_test.go
rpc/args_test.go
+33
-2
未找到文件。
rpc/args.go
浏览文件 @
1e61b75c
...
...
@@ -467,7 +467,7 @@ func (args *BlockFilterArgs) UnmarshalJSON(b []byte) (err error) {
switch
fromstr
{
case
"latest"
:
args
.
Earliest
=
0
args
.
Earliest
=
-
1
default
:
args
.
Earliest
=
int64
(
common
.
Big
(
obj
[
0
]
.
FromBlock
.
(
string
))
.
Int64
())
}
...
...
@@ -479,9 +479,9 @@ func (args *BlockFilterArgs) UnmarshalJSON(b []byte) (err error) {
switch
tostr
{
case
"latest"
:
args
.
Latest
=
0
case
"pending"
:
args
.
Latest
=
-
1
case
"pending"
:
args
.
Latest
=
-
2
default
:
args
.
Latest
=
int64
(
common
.
Big
(
obj
[
0
]
.
ToBlock
.
(
string
))
.
Int64
())
}
...
...
@@ -775,8 +775,7 @@ func (args *SubmitWorkArgs) UnmarshalJSON(b []byte) (err error) {
return
NewDecodeParamError
(
"Nonce is not a string"
)
}
args
.
Nonce
=
common
.
BytesToNumber
(
common
.
Hex2Bytes
(
objstr
))
args
.
Nonce
=
common
.
String2Big
(
objstr
)
.
Uint64
()
if
objstr
,
ok
=
obj
[
1
]
.
(
string
);
!
ok
{
return
NewDecodeParamError
(
"Header is not a string"
)
}
...
...
rpc/args_test.go
浏览文件 @
1e61b75c
...
...
@@ -5,6 +5,8 @@ import (
"encoding/json"
"math/big"
"testing"
"github.com/ethereum/go-ethereum/common"
)
func
TestSha3
(
t
*
testing
.
T
)
{
...
...
@@ -440,8 +442,8 @@ func TestBlockFilterArgsWords(t *testing.T) {
"toBlock": "pending"
}]`
expected
:=
new
(
BlockFilterArgs
)
expected
.
Earliest
=
0
expected
.
Latest
=
-
1
expected
.
Earliest
=
-
1
expected
.
Latest
=
-
2
args
:=
new
(
BlockFilterArgs
)
if
err
:=
json
.
Unmarshal
([]
byte
(
input
),
&
args
);
err
!=
nil
{
...
...
@@ -651,6 +653,10 @@ func TestFilterStringArgs(t *testing.T) {
t
.
Error
(
err
)
}
if
err
:=
args
.
requirements
();
err
!=
nil
{
t
.
Error
(
err
)
}
if
expected
.
Word
!=
args
.
Word
{
t
.
Errorf
(
"Word shoud be %#v but is %#v"
,
expected
.
Word
,
args
.
Word
)
}
...
...
@@ -720,3 +726,28 @@ func TestHashIndexArgs(t *testing.T) {
t
.
Errorf
(
"Index shoud be %#v but is %#v"
,
expected
.
Index
,
args
.
Index
)
}
}
func
TestSubmitWorkArgs
(
t
*
testing
.
T
)
{
input
:=
`["0x0000000000000001", "0x1234567890abcdef1234567890abcdef", "0xD1GE5700000000000000000000000000"]`
expected
:=
new
(
SubmitWorkArgs
)
expected
.
Nonce
=
1
expected
.
Header
=
common
.
HexToHash
(
"0x1234567890abcdef1234567890abcdef"
)
expected
.
Digest
=
common
.
HexToHash
(
"0xD1GE5700000000000000000000000000"
)
args
:=
new
(
SubmitWorkArgs
)
if
err
:=
json
.
Unmarshal
([]
byte
(
input
),
&
args
);
err
!=
nil
{
t
.
Error
(
err
)
}
if
expected
.
Nonce
!=
args
.
Nonce
{
t
.
Errorf
(
"Nonce shoud be %d but is %d"
,
expected
.
Nonce
,
args
.
Nonce
)
}
if
expected
.
Header
!=
args
.
Header
{
t
.
Errorf
(
"Header shoud be %#v but is %#v"
,
expected
.
Header
,
args
.
Header
)
}
if
expected
.
Digest
!=
args
.
Digest
{
t
.
Errorf
(
"Digest shoud be %#v but is %#v"
,
expected
.
Digest
,
args
.
Digest
)
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录