Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
06214315
Unverified
Commit
06214315
authored
May 23, 2023
by
protolambda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
op-node: fix p2p peerstore instantiation
parent
fdabf5d9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
host.go
op-node/p2p/host.go
+3
-1
peer_scores_test.go
op-node/p2p/peer_scores_test.go
+4
-1
No files found.
op-node/p2p/host.go
View file @
06214315
...
@@ -7,6 +7,8 @@ import (
...
@@ -7,6 +7,8 @@ import (
"sync"
"sync"
"time"
"time"
"github.com/ethereum-optimism/optimism/op-service/clock"
"github.com/ethereum-optimism/optimism/op-node/p2p/store"
"github.com/ethereum-optimism/optimism/op-node/p2p/store"
libp2p
"github.com/libp2p/go-libp2p"
libp2p
"github.com/libp2p/go-libp2p"
lconf
"github.com/libp2p/go-libp2p/config"
lconf
"github.com/libp2p/go-libp2p/config"
...
@@ -138,7 +140,7 @@ func (conf *Config) Host(log log.Logger, reporter metrics.Reporter) (host.Host,
...
@@ -138,7 +140,7 @@ func (conf *Config) Host(log log.Logger, reporter metrics.Reporter) (host.Host,
return
nil
,
fmt
.
Errorf
(
"failed to open peerstore: %w"
,
err
)
return
nil
,
fmt
.
Errorf
(
"failed to open peerstore: %w"
,
err
)
}
}
ps
,
err
:=
store
.
NewExtendedPeerstore
(
context
.
Background
(),
basePs
,
conf
.
Store
)
ps
,
err
:=
store
.
NewExtendedPeerstore
(
context
.
Background
(),
log
,
clock
.
SystemClock
,
basePs
,
conf
.
Store
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"failed to open extended peerstore: %w"
,
err
)
return
nil
,
fmt
.
Errorf
(
"failed to open extended peerstore: %w"
,
err
)
}
}
...
...
op-node/p2p/peer_scores_test.go
View file @
06214315
...
@@ -7,6 +7,8 @@ import (
...
@@ -7,6 +7,8 @@ import (
"testing"
"testing"
"time"
"time"
"github.com/ethereum-optimism/optimism/op-service/clock"
p2p
"github.com/ethereum-optimism/optimism/op-node/p2p"
p2p
"github.com/ethereum-optimism/optimism/op-node/p2p"
p2pMocks
"github.com/ethereum-optimism/optimism/op-node/p2p/mocks"
p2pMocks
"github.com/ethereum-optimism/optimism/op-node/p2p/mocks"
"github.com/ethereum-optimism/optimism/op-node/p2p/store"
"github.com/ethereum-optimism/optimism/op-node/p2p/store"
...
@@ -72,9 +74,10 @@ func (c *customPeerstoreNetwork) Close() error {
...
@@ -72,9 +74,10 @@ func (c *customPeerstoreNetwork) Close() error {
// getNetHosts generates a slice of hosts using the [libp2p/go-libp2p] library.
// getNetHosts generates a slice of hosts using the [libp2p/go-libp2p] library.
func
getNetHosts
(
testSuite
*
PeerScoresTestSuite
,
ctx
context
.
Context
,
n
int
)
[]
host
.
Host
{
func
getNetHosts
(
testSuite
*
PeerScoresTestSuite
,
ctx
context
.
Context
,
n
int
)
[]
host
.
Host
{
var
out
[]
host
.
Host
var
out
[]
host
.
Host
log
:=
testlog
.
Logger
(
testSuite
.
T
(),
log
.
LvlError
)
for
i
:=
0
;
i
<
n
;
i
++
{
for
i
:=
0
;
i
<
n
;
i
++
{
swarm
:=
tswarm
.
GenSwarm
(
testSuite
.
T
())
swarm
:=
tswarm
.
GenSwarm
(
testSuite
.
T
())
eps
,
err
:=
store
.
NewExtendedPeerstore
(
ctx
,
swarm
.
Peerstore
(),
sync
.
MutexWrap
(
ds
.
NewMapDatastore
()))
eps
,
err
:=
store
.
NewExtendedPeerstore
(
ctx
,
log
,
clock
.
SystemClock
,
swarm
.
Peerstore
(),
sync
.
MutexWrap
(
ds
.
NewMapDatastore
()))
netw
:=
&
customPeerstoreNetwork
{
swarm
,
eps
}
netw
:=
&
customPeerstoreNetwork
{
swarm
,
eps
}
require
.
NoError
(
testSuite
.
T
(),
err
)
require
.
NoError
(
testSuite
.
T
(),
err
)
h
:=
bhost
.
NewBlankHost
(
netw
)
h
:=
bhost
.
NewBlankHost
(
netw
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment