Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
070caec4
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,发现更多精彩内容 >>
提交
070caec4
编写于
11月 21, 2018
作者:
J
Janoš Guljaš
提交者:
Anton Evangelatov
11月 21, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
swarm/network/stream: use swarm/mock/mem as mock global store (#18157)
上级
4c181e4f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
53 deletion
+11
-53
swarm/network/stream/common_test.go
swarm/network/stream/common_test.go
+0
-16
swarm/network/stream/snapshot_sync_test.go
swarm/network/stream/snapshot_sync_test.go
+6
-21
swarm/network/stream/syncer_test.go
swarm/network/stream/syncer_test.go
+5
-16
未找到文件。
swarm/network/stream/common_test.go
浏览文件 @
070caec4
...
...
@@ -38,7 +38,6 @@ import (
"github.com/ethereum/go-ethereum/swarm/pot"
"github.com/ethereum/go-ethereum/swarm/state"
"github.com/ethereum/go-ethereum/swarm/storage"
mockdb
"github.com/ethereum/go-ethereum/swarm/storage/mock/db"
"github.com/ethereum/go-ethereum/swarm/testutil"
colorable
"github.com/mattn/go-colorable"
)
...
...
@@ -69,21 +68,6 @@ func init() {
log
.
Root
()
.
SetHandler
(
log
.
LvlFilterHandler
(
log
.
Lvl
(
*
loglevel
),
log
.
StreamHandler
(
colorable
.
NewColorableStderr
(),
log
.
TerminalFormat
(
true
))))
}
func
createGlobalStore
()
(
string
,
*
mockdb
.
GlobalStore
,
error
)
{
var
globalStore
*
mockdb
.
GlobalStore
globalStoreDir
,
err
:=
ioutil
.
TempDir
(
""
,
"global.store"
)
if
err
!=
nil
{
log
.
Error
(
"Error initiating global store temp directory!"
,
"err"
,
err
)
return
""
,
nil
,
err
}
globalStore
,
err
=
mockdb
.
NewGlobalStore
(
globalStoreDir
)
if
err
!=
nil
{
log
.
Error
(
"Error initiating global store!"
,
"err"
,
err
)
return
""
,
nil
,
err
}
return
globalStoreDir
,
globalStore
,
nil
}
func
newStreamerTester
(
t
*
testing
.
T
,
registryOptions
*
RegistryOptions
)
(
*
p2ptest
.
ProtocolTester
,
*
Registry
,
*
storage
.
LocalStore
,
func
(),
error
)
{
// setup
addr
:=
network
.
RandomAddr
()
// tested peers peer address
...
...
swarm/network/stream/snapshot_sync_test.go
浏览文件 @
070caec4
...
...
@@ -35,7 +35,8 @@ import (
"github.com/ethereum/go-ethereum/swarm/pot"
"github.com/ethereum/go-ethereum/swarm/state"
"github.com/ethereum/go-ethereum/swarm/storage"
mockdb
"github.com/ethereum/go-ethereum/swarm/storage/mock/db"
"github.com/ethereum/go-ethereum/swarm/storage/mock"
mockmem
"github.com/ethereum/go-ethereum/swarm/storage/mock/mem"
"github.com/ethereum/go-ethereum/swarm/testutil"
)
...
...
@@ -268,20 +269,9 @@ func runSim(conf *synctestConfig, ctx context.Context, sim *simulation.Simulatio
// File retrieval check is repeated until all uploaded files are retrieved from all nodes
// or until the timeout is reached.
var
gDir
string
var
globalStore
*
mockdb
.
GlobalStore
var
globalStore
mock
.
GlobalStorer
if
*
useMockStore
{
gDir
,
globalStore
,
err
=
createGlobalStore
()
if
err
!=
nil
{
return
fmt
.
Errorf
(
"Something went wrong; using mockStore enabled but globalStore is nil"
)
}
defer
func
()
{
os
.
RemoveAll
(
gDir
)
err
:=
globalStore
.
Close
()
if
err
!=
nil
{
log
.
Error
(
"Error closing global store! %v"
,
"err"
,
err
)
}
}()
globalStore
=
mockmem
.
NewGlobalStore
()
}
REPEAT
:
for
{
...
...
@@ -476,14 +466,9 @@ func testSyncingViaDirectSubscribe(t *testing.T, chunkCount int, nodeCount int)
return
err
}
var
gDir
string
var
globalStore
*
mockdb
.
GlobalStore
var
globalStore
mock
.
GlobalStorer
if
*
useMockStore
{
gDir
,
globalStore
,
err
=
createGlobalStore
()
if
err
!=
nil
{
return
fmt
.
Errorf
(
"Something went wrong; using mockStore enabled but globalStore is nil"
)
}
defer
os
.
RemoveAll
(
gDir
)
globalStore
=
mockmem
.
NewGlobalStore
()
}
// File retrieval check is repeated until all uploaded files are retrieved from all nodes
// or until the timeout is reached.
...
...
swarm/network/stream/syncer_test.go
浏览文件 @
070caec4
...
...
@@ -35,7 +35,8 @@ import (
"github.com/ethereum/go-ethereum/swarm/network/simulation"
"github.com/ethereum/go-ethereum/swarm/state"
"github.com/ethereum/go-ethereum/swarm/storage"
mockdb
"github.com/ethereum/go-ethereum/swarm/storage/mock/db"
"github.com/ethereum/go-ethereum/swarm/storage/mock"
mockmem
"github.com/ethereum/go-ethereum/swarm/storage/mock/mem"
"github.com/ethereum/go-ethereum/swarm/testutil"
)
...
...
@@ -48,7 +49,7 @@ func TestSyncerSimulation(t *testing.T) {
testSyncBetweenNodes
(
t
,
16
,
1
,
dataChunkCount
,
true
,
1
)
}
func
createMockStore
(
globalStore
*
mockdb
.
GlobalStore
,
id
enode
.
ID
,
addr
*
network
.
BzzAddr
)
(
lstore
storage
.
ChunkStore
,
datadir
string
,
err
error
)
{
func
createMockStore
(
globalStore
mock
.
GlobalStorer
,
id
enode
.
ID
,
addr
*
network
.
BzzAddr
)
(
lstore
storage
.
ChunkStore
,
datadir
string
,
err
error
)
{
address
:=
common
.
BytesToAddress
(
id
.
Bytes
())
mockStore
:=
globalStore
.
NewNodeStore
(
address
)
params
:=
storage
.
NewDefaultLocalStoreParams
()
...
...
@@ -70,8 +71,7 @@ func testSyncBetweenNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck
sim
:=
simulation
.
New
(
map
[
string
]
simulation
.
ServiceFunc
{
"streamer"
:
func
(
ctx
*
adapters
.
ServiceContext
,
bucket
*
sync
.
Map
)
(
s
node
.
Service
,
cleanup
func
(),
err
error
)
{
var
store
storage
.
ChunkStore
var
globalStore
*
mockdb
.
GlobalStore
var
gDir
,
datadir
string
var
datadir
string
node
:=
ctx
.
Config
.
Node
()
addr
:=
network
.
NewAddr
(
node
)
...
...
@@ -79,11 +79,7 @@ func testSyncBetweenNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck
addr
.
OAddr
[
0
]
=
byte
(
0
)
if
*
useMockStore
{
gDir
,
globalStore
,
err
=
createGlobalStore
()
if
err
!=
nil
{
return
nil
,
nil
,
fmt
.
Errorf
(
"Something went wrong; using mockStore enabled but globalStore is nil"
)
}
store
,
datadir
,
err
=
createMockStore
(
globalStore
,
node
.
ID
(),
addr
)
store
,
datadir
,
err
=
createMockStore
(
mockmem
.
NewGlobalStore
(),
node
.
ID
(),
addr
)
}
else
{
store
,
datadir
,
err
=
createTestLocalStorageForID
(
node
.
ID
(),
addr
)
}
...
...
@@ -94,13 +90,6 @@ func testSyncBetweenNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck
cleanup
=
func
()
{
store
.
Close
()
os
.
RemoveAll
(
datadir
)
if
*
useMockStore
{
err
:=
globalStore
.
Close
()
if
err
!=
nil
{
log
.
Error
(
"Error closing global store! %v"
,
"err"
,
err
)
}
os
.
RemoveAll
(
gDir
)
}
}
localStore
:=
store
.
(
*
storage
.
LocalStore
)
netStore
,
err
:=
storage
.
NewNetStore
(
localStore
,
nil
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录