Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MSFDG: adapt AttackV2 and StepV2 functions in op-challenger2 and alphabet E2E test #105

Open
wants to merge 24 commits into
base: develop
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9541939
Merge remote-tracking branch 'origin/po/common-datatypes' into bill/o…
JustXxx Nov 2, 2024
ad007d7
feat(MSFDG): add getSubValues
dajuguan Nov 3, 2024
854429a
Merge remote-tracking branch 'origin/develop' into bill/op-challenger…
JustXxx Nov 3, 2024
6c1e5b9
op-challenger2 add attackV2
JustXxx Nov 3, 2024
5d65304
Merge remote-tracking branch 'origin/po/getsubclaims' into bill/op-ch…
JustXxx Nov 3, 2024
360b88b
op-challenger2 add stepV2
JustXxx Nov 10, 2024
ef4cc9e
merge po/oracle_proof
JustXxx Nov 10, 2024
42d3a98
add getStepData tests for solver_test.go
dajuguan Nov 15, 2024
53c81ac
modify test
JustXxx Nov 16, 2024
94d5923
merge
JustXxx Nov 16, 2024
97e5c1c
fix step maxAttackBranch test case
dajuguan Nov 16, 2024
591fa5d
fix bug by rules
JustXxx Nov 17, 2024
1cab66d
Merge remote-tracking branch 'origin/bill/op-challenger2-attackv2' in…
JustXxx Nov 17, 2024
0805fd4
add getstepData testcase
dajuguan Nov 21, 2024
6b7839b
Merge remote-tracking branch 'origin/bill/op-challenger2-attackv2' in…
JustXxx Nov 21, 2024
f65fdc3
modify unittest TestCalculateNextActions
JustXxx Nov 22, 2024
c026566
Merge remote-tracking branch 'origin/develop' into bill/op-challenger…
JustXxx Nov 23, 2024
32ca079
fix: TestMultipleRoundsWithNbits1/2
dajuguan Nov 27, 2024
0176d08
fix tests: responder_test and TestGetStepDataWithOutputRoot test
dajuguan Nov 27, 2024
670ca68
fix: getTxByHash and filterLog call in devnet env
dajuguan Nov 29, 2024
162ec26
contract:
dajuguan Nov 29, 2024
2716b1e
fix: VMStateRoot only has one subValue
dajuguan Nov 30, 2024
772c2ac
op-challenger2: cosmatic and pass all tests
dajuguan Nov 30, 2024
c1513a0
test: alphabet game e2etest for MSFDG
dajuguan Nov 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion op-challenger2/game/fault/solver/solver_test.go
Original file line number Diff line number Diff line change
@@ -557,7 +557,8 @@ func TestAttemptStepNary4(t *testing.T) {
t.Run(tableTest.name, func(t *testing.T) {
builder := claimBuilder.GameBuilder(faulttest.WithInvalidValue(tableTest.agreeWithOutputRoot))
tableTest.setupGame(builder)
alphabetSolver := newClaimSolver(maxDepth, trace.NewSimpleTraceAccessor(claimBuilder.CorrectTraceProvider()), types.CallDataType)
accessor := trace.NewSimpleTraceAccessor(claimBuilder.CorrectTraceProvider())
alphabetSolver := newClaimSolver(maxDepth, accessor, types.CallDataType)
game := builder.Game
claims := game.Claims()
lastClaim := claims[len(claims)-1]
@@ -572,6 +573,8 @@ func TestAttemptStepNary4(t *testing.T) {
}
step, err := alphabetSolver.AttemptStep(ctx, game, lastClaim, agreedClaims, tableTest.attackBranch)
require.ErrorIs(t, err, tableTest.expectedErr)
_, _, preimage, err := accessor.GetStepData2(ctx, game, lastClaim, lastClaim.MoveRightN(tableTest.expectAttackBranch))
require.NoError(t, err)
if !tableTest.expectNoStep && tableTest.expectedErr == nil {
require.NotNil(t, step)
require.Equal(t, lastClaim, step.LeafClaim)
@@ -584,6 +587,8 @@ func TestAttemptStepNary4(t *testing.T) {
require.Equal(t, tableTest.expectedOracleData.OracleOffset, step.OracleData.OracleOffset)
require.Equal(t, tableTest.expectedVMStateData.PreDA, step.OracleData.VMStateDA.PreDA)
require.Equal(t, tableTest.expectedVMStateData.PostDA, step.OracleData.VMStateDA.PostDA)
require.Equal(t, tableTest.expectedVMStateData.PreDA, preimage.VMStateDA.PreDA)
require.Equal(t, tableTest.expectedVMStateData.PostDA, preimage.VMStateDA.PostDA)
require.Equal(t, tableTest.expectedLocalData.DaType, step.OracleData.OutputRootDAItem.DaType)
require.Equal(t, tableTest.expectedLocalData.DataHash, step.OracleData.OutputRootDAItem.DataHash)
require.Equal(t, tableTest.expectedLocalData.Proof, step.OracleData.OutputRootDAItem.Proof)