Removes arbutil.MessageCount

diegoximenes · diegoximenes · commit f6d1a299d888 · 2025-03-11T12:56:51.000-03:00
diff --git a/arbutil/block_message_relation.go b/arbutil/block_message_relation.go
@@ -6,14 +6,11 @@ package arbutil
 // messages are 0-indexed
 type MessageIndex uint64
 
-// represents the number of messages
-type MessageCount uint64
-
-func BlockNumberToMessageCount(blockNumber uint64, genesisBlockNumber uint64) MessageCount {
-	return MessageCount(blockNumber + 1 - genesisBlockNumber)
+func BlockNumberToMessageCount(blockNumber uint64, genesisBlockNumber uint64) MessageIndex {
+	return MessageIndex(blockNumber + 1 - genesisBlockNumber)
 }
 
-func MessageCountToBlockNumber(messageCount MessageCount, genesisBlockNumber uint64) int64 {
+func MessageCountToBlockNumber(messageCount MessageIndex, genesisBlockNumber uint64) int64 {
 	// #nosec G115
 	return int64(uint64(messageCount)+genesisBlockNumber) - 1
 }
diff --git a/cmd/pruning/pruning.go b/cmd/pruning/pruning.go
@@ -213,7 +213,7 @@ func findImportantRoots(ctx context.Context, chainDb ethdb.Database, stack *node
 				return nil, err
 			}
 			if meta.ParentChainBlock <= l1BlockNum {
-				signedBlockNum := arbutil.MessageCountToBlockNumber(arbutil.MessageCount(meta.MessageCount), genesisNum)
+				signedBlockNum := arbutil.MessageCountToBlockNumber(meta.MessageCount, genesisNum)
 				// #nosec G115
 				blockNum := uint64(signedBlockNum)
 				l2Hash := rawdb.ReadCanonicalHash(chainDb, blockNum)

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ func findImportantRoots(ctx context.Context, chainDb ethdb.Database, stack *node`
`213`	`213`	`return nil, err`
`214`	`214`	`}`
`215`	`215`	`if meta.ParentChainBlock <= l1BlockNum {`
`216`		`- signedBlockNum := arbutil.MessageCountToBlockNumber(arbutil.MessageCount(meta.MessageCount), genesisNum)`
	`216`	`+ signedBlockNum := arbutil.MessageCountToBlockNumber(meta.MessageCount, genesisNum)`
`217`	`217`	`// #nosec G115`
`218`	`218`	`blockNum := uint64(signedBlockNum)`
`219`	`219`	`l2Hash := rawdb.ReadCanonicalHash(chainDb, blockNum)`