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
2b19d088
Unverified
Commit
2b19d088
authored
Aug 13, 2024
by
Adrian Sutton
Committed by
GitHub
Aug 13, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
op-challenger: Do not resolve games in selective mode (#11430)
parent
97aac006
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
10 deletions
+28
-10
agent.go
op-challenger/game/fault/agent.go
+5
-0
agent_test.go
op-challenger/game/fault/agent_test.go
+23
-10
No files found.
op-challenger/game/fault/agent.go
View file @
2b19d088
...
@@ -155,6 +155,11 @@ func (a *Agent) tryResolve(ctx context.Context) bool {
...
@@ -155,6 +155,11 @@ func (a *Agent) tryResolve(ctx context.Context) bool {
a
.
log
.
Error
(
"Failed to resolve claims"
,
"err"
,
err
)
a
.
log
.
Error
(
"Failed to resolve claims"
,
"err"
,
err
)
return
false
return
false
}
}
if
a
.
selective
{
// Never resolve games in selective mode as it won't unlock any bonds for us.
// Assume the game is still in progress or the player wouldn't have told us to act.
return
false
}
status
,
err
:=
a
.
responder
.
CallResolve
(
ctx
)
status
,
err
:=
a
.
responder
.
CallResolve
(
ctx
)
if
err
!=
nil
||
status
==
gameTypes
.
GameStatusInProgress
{
if
err
!=
nil
||
status
==
gameTypes
.
GameStatusInProgress
{
return
false
return
false
...
...
op-challenger/game/fault/agent_test.go
View file @
2b19d088
...
@@ -4,6 +4,7 @@ import (
...
@@ -4,6 +4,7 @@ import (
"context"
"context"
"errors"
"errors"
"math/big"
"math/big"
"slices"
"sync"
"sync"
"testing"
"testing"
"time"
"time"
...
@@ -127,20 +128,27 @@ func TestAgent_SelectiveClaimResolution(t *testing.T) {
...
@@ -127,20 +128,27 @@ func TestAgent_SelectiveClaimResolution(t *testing.T) {
},
},
}
}
for
_
,
t
est
:=
range
tests
{
for
_
,
t
Case
:=
range
tests
{
t
est
:=
test
t
Case
:=
tCase
t
.
Run
(
t
est
.
name
,
func
(
t
*
testing
.
T
)
{
t
.
Run
(
t
Case
.
name
,
func
(
t
*
testing
.
T
)
{
agent
,
claimLoader
,
responder
:=
setupTestAgent
(
t
)
agent
,
claimLoader
,
responder
:=
setupTestAgent
(
t
)
agent
.
selective
=
t
est
.
selective
agent
.
selective
=
t
Case
.
selective
agent
.
claimants
=
t
est
.
claimants
agent
.
claimants
=
t
Case
.
claimants
claimLoader
.
maxLoads
=
1
claimLoader
.
maxLoads
=
1
claimLoader
.
claims
=
test
.
claims
if
tCase
.
selective
{
responder
.
callResolveStatus
=
test
.
callResolveStatus
claimLoader
.
maxLoads
=
0
}
claimLoader
.
claims
=
tCase
.
claims
responder
.
callResolveStatus
=
tCase
.
callResolveStatus
require
.
NoError
(
t
,
agent
.
Act
(
ctx
))
require
.
NoError
(
t
,
agent
.
Act
(
ctx
))
require
.
Equal
(
t
,
test
.
expectedResolveCount
,
responder
.
callResolveClaimCount
,
"should check if game is resolvable"
)
require
.
Equal
(
t
,
tCase
.
expectedResolveCount
,
responder
.
callResolveClaimCount
,
"should check if game is resolvable"
)
require
.
Equal
(
t
,
test
.
expectedResolveCount
,
responder
.
resolveClaimCount
,
"should check if game is resolvable"
)
require
.
Equal
(
t
,
tCase
.
expectedResolveCount
,
responder
.
resolveClaimCount
,
"should check if game is resolvable"
)
if
tCase
.
selective
{
require
.
Equal
(
t
,
0
,
responder
.
callResolveCount
,
"should not resolve game in selective mode"
)
require
.
Equal
(
t
,
0
,
responder
.
resolveCount
,
"should not resolve game in selective mode"
)
}
})
})
}
}
}
}
...
@@ -230,6 +238,7 @@ type stubResponder struct {
...
@@ -230,6 +238,7 @@ type stubResponder struct {
callResolveClaimCount
int
callResolveClaimCount
int
callResolveClaimErr
error
callResolveClaimErr
error
resolveClaimCount
int
resolveClaimCount
int
resolvedClaims
[]
uint64
}
}
func
(
s
*
stubResponder
)
CallResolve
(
_
context
.
Context
)
(
gameTypes
.
GameStatus
,
error
)
{
func
(
s
*
stubResponder
)
CallResolve
(
_
context
.
Context
)
(
gameTypes
.
GameStatus
,
error
)
{
...
@@ -246,9 +255,12 @@ func (s *stubResponder) Resolve() error {
...
@@ -246,9 +255,12 @@ func (s *stubResponder) Resolve() error {
return
s
.
resolveErr
return
s
.
resolveErr
}
}
func
(
s
*
stubResponder
)
CallResolveClaim
(
_
context
.
Context
,
_
uint64
)
error
{
func
(
s
*
stubResponder
)
CallResolveClaim
(
_
context
.
Context
,
idx
uint64
)
error
{
s
.
l
.
Lock
()
s
.
l
.
Lock
()
defer
s
.
l
.
Unlock
()
defer
s
.
l
.
Unlock
()
if
slices
.
Contains
(
s
.
resolvedClaims
,
idx
)
{
return
errors
.
New
(
"already resolved"
)
}
s
.
callResolveClaimCount
++
s
.
callResolveClaimCount
++
return
s
.
callResolveClaimErr
return
s
.
callResolveClaimErr
}
}
...
@@ -257,6 +269,7 @@ func (s *stubResponder) ResolveClaims(claims ...uint64) error {
...
@@ -257,6 +269,7 @@ func (s *stubResponder) ResolveClaims(claims ...uint64) error {
s
.
l
.
Lock
()
s
.
l
.
Lock
()
defer
s
.
l
.
Unlock
()
defer
s
.
l
.
Unlock
()
s
.
resolveClaimCount
+=
len
(
claims
)
s
.
resolveClaimCount
+=
len
(
claims
)
s
.
resolvedClaims
=
append
(
s
.
resolvedClaims
,
claims
...
)
return
nil
return
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