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
2a9c6cc7
Unverified
Commit
2a9c6cc7
authored
Aug 19, 2023
by
Adrian Sutton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
op-challenger: Rename Game to GamePlayer
parent
f721de84
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
game.go
op-challenger/fault/game.go
+5
-5
game_test.go
op-challenger/fault/game_test.go
+2
-2
service.go
op-challenger/fault/service.go
+1
-1
No files found.
op-challenger/fault/game.go
View file @
2a9c6cc7
...
@@ -24,21 +24,21 @@ type GameInfo interface {
...
@@ -24,21 +24,21 @@ type GameInfo interface {
LogGameInfo
(
ctx
context
.
Context
)
LogGameInfo
(
ctx
context
.
Context
)
}
}
type
Game
struct
{
type
Game
Player
struct
{
agent
Actor
agent
Actor
agreeWithProposedOutput
bool
agreeWithProposedOutput
bool
caller
GameInfo
caller
GameInfo
logger
log
.
Logger
logger
log
.
Logger
}
}
func
NewGame
(
func
NewGame
Player
(
ctx
context
.
Context
,
ctx
context
.
Context
,
logger
log
.
Logger
,
logger
log
.
Logger
,
cfg
*
config
.
Config
,
cfg
*
config
.
Config
,
addr
common
.
Address
,
addr
common
.
Address
,
txMgr
txmgr
.
TxManager
,
txMgr
txmgr
.
TxManager
,
client
*
ethclient
.
Client
,
client
*
ethclient
.
Client
,
)
(
*
Game
,
error
)
{
)
(
*
Game
Player
,
error
)
{
logger
=
logger
.
New
(
"game"
,
addr
)
logger
=
logger
.
New
(
"game"
,
addr
)
contract
,
err
:=
bindings
.
NewFaultDisputeGameCaller
(
addr
,
client
)
contract
,
err
:=
bindings
.
NewFaultDisputeGameCaller
(
addr
,
client
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -85,7 +85,7 @@ func NewGame(
...
@@ -85,7 +85,7 @@ func NewGame(
return
nil
,
fmt
.
Errorf
(
"failed to bind the fault contract: %w"
,
err
)
return
nil
,
fmt
.
Errorf
(
"failed to bind the fault contract: %w"
,
err
)
}
}
return
&
Game
{
return
&
Game
Player
{
agent
:
NewAgent
(
loader
,
int
(
gameDepth
),
provider
,
responder
,
updater
,
cfg
.
AgreeWithProposedOutput
,
logger
),
agent
:
NewAgent
(
loader
,
int
(
gameDepth
),
provider
,
responder
,
updater
,
cfg
.
AgreeWithProposedOutput
,
logger
),
agreeWithProposedOutput
:
cfg
.
AgreeWithProposedOutput
,
agreeWithProposedOutput
:
cfg
.
AgreeWithProposedOutput
,
caller
:
caller
,
caller
:
caller
,
...
@@ -93,7 +93,7 @@ func NewGame(
...
@@ -93,7 +93,7 @@ func NewGame(
},
nil
},
nil
}
}
func
(
g
*
Game
)
ProgressGame
(
ctx
context
.
Context
)
bool
{
func
(
g
*
Game
Player
)
ProgressGame
(
ctx
context
.
Context
)
bool
{
g
.
logger
.
Trace
(
"Checking if actions are required"
)
g
.
logger
.
Trace
(
"Checking if actions are required"
)
if
err
:=
g
.
agent
.
Act
(
ctx
);
err
!=
nil
{
if
err
:=
g
.
agent
.
Act
(
ctx
);
err
!=
nil
{
g
.
logger
.
Error
(
"Error when acting on game"
,
"err"
,
err
)
g
.
logger
.
Error
(
"Error when acting on game"
,
"err"
,
err
)
...
...
op-challenger/fault/game_test.go
View file @
2a9c6cc7
...
@@ -84,7 +84,7 @@ func TestProgressGame_LogErrorWhenGameLost(t *testing.T) {
...
@@ -84,7 +84,7 @@ func TestProgressGame_LogErrorWhenGameLost(t *testing.T) {
}
}
}
}
func
setupProgressGameTest
(
t
*
testing
.
T
,
agreeWithProposedRoot
bool
)
(
*
testlog
.
CapturingHandler
,
*
Game
,
*
stubActor
,
*
stubGameInfo
)
{
func
setupProgressGameTest
(
t
*
testing
.
T
,
agreeWithProposedRoot
bool
)
(
*
testlog
.
CapturingHandler
,
*
Game
Player
,
*
stubActor
,
*
stubGameInfo
)
{
logger
:=
testlog
.
Logger
(
t
,
log
.
LvlDebug
)
logger
:=
testlog
.
Logger
(
t
,
log
.
LvlDebug
)
handler
:=
&
testlog
.
CapturingHandler
{
handler
:=
&
testlog
.
CapturingHandler
{
Delegate
:
logger
.
GetHandler
(),
Delegate
:
logger
.
GetHandler
(),
...
@@ -92,7 +92,7 @@ func setupProgressGameTest(t *testing.T, agreeWithProposedRoot bool) (*testlog.C
...
@@ -92,7 +92,7 @@ func setupProgressGameTest(t *testing.T, agreeWithProposedRoot bool) (*testlog.C
logger
.
SetHandler
(
handler
)
logger
.
SetHandler
(
handler
)
actor
:=
&
stubActor
{}
actor
:=
&
stubActor
{}
gameInfo
:=
&
stubGameInfo
{}
gameInfo
:=
&
stubGameInfo
{}
game
:=
&
Game
{
game
:=
&
Game
Player
{
agent
:
actor
,
agent
:
actor
,
agreeWithProposedOutput
:
agreeWithProposedRoot
,
agreeWithProposedOutput
:
agreeWithProposedRoot
,
caller
:
gameInfo
,
caller
:
gameInfo
,
...
...
op-challenger/fault/service.go
View file @
2a9c6cc7
...
@@ -47,7 +47,7 @@ func NewService(ctx context.Context, logger log.Logger, cfg *config.Config) (*se
...
@@ -47,7 +47,7 @@ func NewService(ctx context.Context, logger log.Logger, cfg *config.Config) (*se
loader
:=
NewGameLoader
(
factory
)
loader
:=
NewGameLoader
(
factory
)
monitor
:=
newGameMonitor
(
logger
,
client
.
BlockNumber
,
cfg
.
GameAddress
,
loader
,
func
(
addr
common
.
Address
)
(
gameAgent
,
error
)
{
monitor
:=
newGameMonitor
(
logger
,
client
.
BlockNumber
,
cfg
.
GameAddress
,
loader
,
func
(
addr
common
.
Address
)
(
gameAgent
,
error
)
{
return
NewGame
(
ctx
,
logger
,
cfg
,
addr
,
txMgr
,
client
)
return
NewGame
Player
(
ctx
,
logger
,
cfg
,
addr
,
txMgr
,
client
)
})
})
return
&
service
{
return
&
service
{
monitor
:
monitor
,
monitor
:
monitor
,
...
...
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