Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
5e1581c2
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,发现更多精彩内容 >>
未验证
提交
5e1581c2
编写于
12月 20, 2017
作者:
P
Péter Szilágyi
提交者:
GitHub
12月 20, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: fix panic when stat-ing a tx from a queue-only account (#15714)
上级
50df2b78
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
58 addition
and
1 deletion
+58
-1
core/tx_pool.go
core/tx_pool.go
+1
-1
core/tx_pool_test.go
core/tx_pool_test.go
+57
-0
未找到文件。
core/tx_pool.go
浏览文件 @
5e1581c2
...
...
@@ -838,7 +838,7 @@ func (pool *TxPool) Status(hashes []common.Hash) []TxStatus {
for
i
,
hash
:=
range
hashes
{
if
tx
:=
pool
.
all
[
hash
];
tx
!=
nil
{
from
,
_
:=
types
.
Sender
(
pool
.
signer
,
tx
)
// already validated
if
pool
.
pending
[
from
]
.
txs
.
items
[
tx
.
Nonce
()]
!=
nil
{
if
pool
.
pending
[
from
]
!=
nil
&&
pool
.
pending
[
from
]
.
txs
.
items
[
tx
.
Nonce
()]
!=
nil
{
status
[
i
]
=
TxStatusPending
}
else
{
status
[
i
]
=
TxStatusQueued
...
...
core/tx_pool_test.go
浏览文件 @
5e1581c2
...
...
@@ -1563,6 +1563,63 @@ func testTransactionJournaling(t *testing.T, nolocals bool) {
pool
.
Stop
()
}
// TestTransactionStatusCheck tests that the pool can correctly retrieve the
// pending status of individual transactions.
func
TestTransactionStatusCheck
(
t
*
testing
.
T
)
{
t
.
Parallel
()
// Create the pool to test the status retrievals with
db
,
_
:=
ethdb
.
NewMemDatabase
()
statedb
,
_
:=
state
.
New
(
common
.
Hash
{},
state
.
NewDatabase
(
db
))
blockchain
:=
&
testBlockChain
{
statedb
,
big
.
NewInt
(
1000000
),
new
(
event
.
Feed
)}
pool
:=
NewTxPool
(
testTxPoolConfig
,
params
.
TestChainConfig
,
blockchain
)
defer
pool
.
Stop
()
// Create the test accounts to check various transaction statuses with
keys
:=
make
([]
*
ecdsa
.
PrivateKey
,
3
)
for
i
:=
0
;
i
<
len
(
keys
);
i
++
{
keys
[
i
],
_
=
crypto
.
GenerateKey
()
pool
.
currentState
.
AddBalance
(
crypto
.
PubkeyToAddress
(
keys
[
i
]
.
PublicKey
),
big
.
NewInt
(
1000000
))
}
// Generate and queue a batch of transactions, both pending and queued
txs
:=
types
.
Transactions
{}
txs
=
append
(
txs
,
pricedTransaction
(
0
,
big
.
NewInt
(
100000
),
big
.
NewInt
(
1
),
keys
[
0
]))
// Pending only
txs
=
append
(
txs
,
pricedTransaction
(
0
,
big
.
NewInt
(
100000
),
big
.
NewInt
(
1
),
keys
[
1
]))
// Pending and queued
txs
=
append
(
txs
,
pricedTransaction
(
2
,
big
.
NewInt
(
100000
),
big
.
NewInt
(
1
),
keys
[
1
]))
txs
=
append
(
txs
,
pricedTransaction
(
2
,
big
.
NewInt
(
100000
),
big
.
NewInt
(
1
),
keys
[
2
]))
// Queued only
// Import the transaction and ensure they are correctly added
pool
.
AddRemotes
(
txs
)
pending
,
queued
:=
pool
.
Stats
()
if
pending
!=
2
{
t
.
Fatalf
(
"pending transactions mismatched: have %d, want %d"
,
pending
,
2
)
}
if
queued
!=
2
{
t
.
Fatalf
(
"queued transactions mismatched: have %d, want %d"
,
queued
,
2
)
}
if
err
:=
validateTxPoolInternals
(
pool
);
err
!=
nil
{
t
.
Fatalf
(
"pool internal state corrupted: %v"
,
err
)
}
// Retrieve the status of each transaction and validate them
hashes
:=
make
([]
common
.
Hash
,
len
(
txs
))
for
i
,
tx
:=
range
txs
{
hashes
[
i
]
=
tx
.
Hash
()
}
hashes
=
append
(
hashes
,
common
.
Hash
{})
statuses
:=
pool
.
Status
(
hashes
)
expect
:=
[]
TxStatus
{
TxStatusPending
,
TxStatusPending
,
TxStatusQueued
,
TxStatusQueued
,
TxStatusUnknown
}
for
i
:=
0
;
i
<
len
(
statuses
);
i
++
{
if
statuses
[
i
]
!=
expect
[
i
]
{
t
.
Errorf
(
"transaction %d: status mismatch: have %v, want %v"
,
i
,
statuses
[
i
],
expect
[
i
])
}
}
}
// Benchmarks the speed of validating the contents of the pending queue of the
// transaction pool.
func
BenchmarkPendingDemotion100
(
b
*
testing
.
B
)
{
benchmarkPendingDemotion
(
b
,
100
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录