Delete Inherited Timer Code, Unskip Tests (#702)

OffchainLabs · Nov 25, 2024 · 9d2c8c6 · 9d2c8c6
1 parent 46b0b50
commit 9d2c8c6
Show file tree

Hide file tree

Showing 8 changed files with 2,231 additions and 2,620 deletions.
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/challenge-manager/chain-watcher/watcher.go b/challenge-manager/chain-watcher/watcher.go
@@ -465,24 +465,6 @@ func (w *Watcher) IsConfirmableEssentialEdge(
 	return confirmable, essentialPaths, timer, err
 }
 
-func (w *Watcher) ComputeRootInheritedTimer(
-	ctx context.Context,
-	challengedAssertionHash protocol.AssertionHash,
-) (protocol.InheritedTimer, error) {
-	chal, ok := w.challenges.TryGet(challengedAssertionHash)
-	if !ok {
-		return 0, fmt.Errorf(
-			"could not get challenge for top level assertion %#x",
-			challengedAssertionHash,
-		)
-	}
-	blockHeaderNumber, err := w.chain.Backend().HeaderU64(ctx)
-	if err != nil {
-		return 0, err
-	}
-	return chal.honestEdgeTree.ComputeRootInheritedTimer(ctx, challengedAssertionHash, blockHeaderNumber)
-}
-
 func (w *Watcher) AllowTrackingEdgeWithParentHash(parentHash protocol.AssertionHash) bool {
 	if len(w.trackChallengeParentAssertionHashes) == 0 {
 		return true

diff --git a/challenge-manager/chain-watcher/watcher_test.go b/challenge-manager/chain-watcher/watcher_test.go
@@ -236,15 +236,8 @@ func TestWatcher_processEdgeAddedEvent(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	chal, ok := watcher.challenges.TryGet(assertionHash)
+	_, ok := watcher.challenges.TryGet(assertionHash)
 	require.Equal(t, true, ok)
-
-	// Expect it to exist and be unrivaled for 10 blocks if we query at block number = 10,
-	// plus the number of blocks the top level assertion was unrivaled (5).
-	blockNumber := uint64(10)
-	resp, err := chal.honestEdgeTree.ComputeRootInheritedTimer(ctx, assertionHash, blockNumber)
-	require.NoError(t, err)
-	require.Equal(t, resp, protocol.InheritedTimer(blockNumber+assertionUnrivaledBlocks))
 }
 
 type mockHonestEdge struct {
@@ -313,10 +306,6 @@ func TestWatcher_AddVerifiedHonestEdge(t *testing.T) {
 
 	err := watcher.AddVerifiedHonestEdge(ctx, honest)
 	require.NoError(t, err)
-	chal, ok := watcher.challenges.TryGet(assertionHash)
+	_, ok := watcher.challenges.TryGet(assertionHash)
 	require.Equal(t, true, ok)
-	blockNum := uint64(20)
-	resp, err := chal.honestEdgeTree.ComputeRootInheritedTimer(ctx, assertionHash, blockNum)
-	require.NoError(t, err)
-	require.Equal(t, blockNum-createdAt+assertionUnrivaledBlocks, uint64(resp))
 }
diff --git a/challenge-manager/challenge-tree/BUILD.bazel b/challenge-manager/challenge-tree/BUILD.bazel
@@ -5,7 +5,6 @@ go_library(
     srcs = [
         "add_edge.go",
         "ancestors.go",
-        "inherited_timer.go",
         "local_timer.go",
         "paths.go",
         "tree.go",
@@ -30,7 +29,6 @@ go_test(
     srcs = [
         "ancestors_test.go",
         "compute_ancestors_test.go",
-        "inherited_timer_test.go",
         "local_timer_test.go",
         "paths_edge_cases_test.go",
         "paths_test.go",

diff --git a/challenge-manager/challenge-tree/inherited_timer.go b/challenge-manager/challenge-tree/inherited_timer.go