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
3d7c6c42
Unverified
Commit
3d7c6c42
authored
Oct 13, 2023
by
Adrian Sutton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
op-challenger: Clean ups
parent
5f870165
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
registry.go
op-challenger/game/registry/registry.go
+3
-0
service.go
op-challenger/game/service.go
+4
-4
No files found.
op-challenger/game/registry/registry.go
View file @
3d7c6c42
...
@@ -22,6 +22,8 @@ func NewGameTypeRegistry() *GameTypeRegistry {
...
@@ -22,6 +22,8 @@ func NewGameTypeRegistry() *GameTypeRegistry {
}
}
}
}
// RegisterGameType registers a scheduler.PlayerCreator to use for a specific game type.
// Panics if the same game type is registered multiple times, since this indicates a significant programmer error.
func
(
r
*
GameTypeRegistry
)
RegisterGameType
(
gameType
uint8
,
creator
scheduler
.
PlayerCreator
)
{
func
(
r
*
GameTypeRegistry
)
RegisterGameType
(
gameType
uint8
,
creator
scheduler
.
PlayerCreator
)
{
if
_
,
ok
:=
r
.
types
[
gameType
];
ok
{
if
_
,
ok
:=
r
.
types
[
gameType
];
ok
{
panic
(
fmt
.
Errorf
(
"duplicate creator registered for game type: %v"
,
gameType
))
panic
(
fmt
.
Errorf
(
"duplicate creator registered for game type: %v"
,
gameType
))
...
@@ -29,6 +31,7 @@ func (r *GameTypeRegistry) RegisterGameType(gameType uint8, creator scheduler.Pl
...
@@ -29,6 +31,7 @@ func (r *GameTypeRegistry) RegisterGameType(gameType uint8, creator scheduler.Pl
r
.
types
[
gameType
]
=
creator
r
.
types
[
gameType
]
=
creator
}
}
// CreatePlayer creates a new game player for the given game, using the specified directory for persisting data.
func
(
r
*
GameTypeRegistry
)
CreatePlayer
(
game
types
.
GameMetadata
,
dir
string
)
(
scheduler
.
GamePlayer
,
error
)
{
func
(
r
*
GameTypeRegistry
)
CreatePlayer
(
game
types
.
GameMetadata
,
dir
string
)
(
scheduler
.
GamePlayer
,
error
)
{
creator
,
ok
:=
r
.
types
[
game
.
GameType
]
creator
,
ok
:=
r
.
types
[
game
.
GameType
]
if
!
ok
{
if
!
ok
{
...
...
op-challenger/game/service.go
View file @
3d7c6c42
...
@@ -9,7 +9,7 @@ import (
...
@@ -9,7 +9,7 @@ import (
"github.com/ethereum-optimism/optimism/op-challenger/config"
"github.com/ethereum-optimism/optimism/op-challenger/config"
"github.com/ethereum-optimism/optimism/op-challenger/game/fault"
"github.com/ethereum-optimism/optimism/op-challenger/game/fault"
"github.com/ethereum-optimism/optimism/op-challenger/game/loader"
"github.com/ethereum-optimism/optimism/op-challenger/game/loader"
registry2
"github.com/ethereum-optimism/optimism/op-challenger/game/registry"
"github.com/ethereum-optimism/optimism/op-challenger/game/registry"
"github.com/ethereum-optimism/optimism/op-challenger/game/scheduler"
"github.com/ethereum-optimism/optimism/op-challenger/game/scheduler"
"github.com/ethereum-optimism/optimism/op-challenger/metrics"
"github.com/ethereum-optimism/optimism/op-challenger/metrics"
"github.com/ethereum-optimism/optimism/op-challenger/version"
"github.com/ethereum-optimism/optimism/op-challenger/version"
...
@@ -94,8 +94,8 @@ func NewService(ctx context.Context, logger log.Logger, cfg *config.Config) (*Se
...
@@ -94,8 +94,8 @@ func NewService(ctx context.Context, logger log.Logger, cfg *config.Config) (*Se
}
}
loader
:=
loader
.
NewGameLoader
(
factoryContract
)
loader
:=
loader
.
NewGameLoader
(
factoryContract
)
registry
:=
registry2
.
NewGameTypeRegistry
()
gameTypeRegistry
:=
registry
.
NewGameTypeRegistry
()
fault
.
RegisterGameTypes
(
r
egistry
,
ctx
,
logger
,
m
,
cfg
,
txMgr
,
l1Client
)
fault
.
RegisterGameTypes
(
gameTypeR
egistry
,
ctx
,
logger
,
m
,
cfg
,
txMgr
,
l1Client
)
disk
:=
newDiskManager
(
cfg
.
Datadir
)
disk
:=
newDiskManager
(
cfg
.
Datadir
)
s
.
sched
=
scheduler
.
NewScheduler
(
s
.
sched
=
scheduler
.
NewScheduler
(
...
@@ -103,7 +103,7 @@ func NewService(ctx context.Context, logger log.Logger, cfg *config.Config) (*Se
...
@@ -103,7 +103,7 @@ func NewService(ctx context.Context, logger log.Logger, cfg *config.Config) (*Se
m
,
m
,
disk
,
disk
,
cfg
.
MaxConcurrency
,
cfg
.
MaxConcurrency
,
r
egistry
.
CreatePlayer
)
gameTypeR
egistry
.
CreatePlayer
)
pollClient
,
err
:=
opClient
.
NewRPCWithClient
(
ctx
,
logger
,
cfg
.
L1EthRpc
,
opClient
.
NewBaseRPCClient
(
l1Client
.
Client
()),
cfg
.
PollInterval
)
pollClient
,
err
:=
opClient
.
NewRPCWithClient
(
ctx
,
logger
,
cfg
.
L1EthRpc
,
opClient
.
NewBaseRPCClient
(
l1Client
.
Client
()),
cfg
.
PollInterval
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
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