rename Message to MessageWithMeta in MessageWithMetadataAndBlockHash

OffchainLabs · May 10, 2024 · bf3c960 · bf3c960
1 parent 1f99ca9
commit bf3c960
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 31 deletions.
diff --git a/arbnode/inbox_test.go b/arbnode/inbox_test.go
@@ -155,7 +155,7 @@ func TestTransactionStreamer(t *testing.T) {
 				var requestId common.Hash
 				binary.BigEndian.PutUint64(requestId.Bytes()[:8], uint64(i))
 				messages = append(messages, arbostypes.MessageWithMetadataAndBlockHash{
-					Message: arbostypes.MessageWithMetadata{
+					MessageWithMeta: arbostypes.MessageWithMetadata{
 						Message: &arbostypes.L1IncomingMessage{
 							Header: &arbostypes.L1IncomingMessageHeader{
 								Kind:      arbostypes.L1MessageType_L2Message,

diff --git a/arbnode/inbox_tracker.go b/arbnode/inbox_tracker.go
@@ -674,7 +674,7 @@ func (t *InboxTracker) AddSequencerBatches(ctx context.Context, client arbutil.L
 			return err
 		}
 		msgWithBlockHash := arbostypes.MessageWithMetadataAndBlockHash{
-			Message: *msg,
+			MessageWithMeta: *msg,
 		}
 		messages = append(messages, msgWithBlockHash)
 		batchMessageCounts[batchSeqNum] = currentpos
@@ -736,7 +736,7 @@ func (t *InboxTracker) AddSequencerBatches(ctx context.Context, client arbutil.L
 	}
 	var latestTimestamp uint64
 	if len(messages) > 0 {
-		latestTimestamp = messages[len(messages)-1].Message.Message.Header.Timestamp
+		latestTimestamp = messages[len(messages)-1].MessageWithMeta.Message.Header.Timestamp
 	}
 	log.Info(
 		"InboxTracker",

diff --git a/arbnode/seq_coordinator.go b/arbnode/seq_coordinator.go
@@ -593,7 +593,7 @@ func (c *SeqCoordinator) update(ctx context.Context) time.Duration {
 			}
 		}
 		msgWithBlockHash := arbostypes.MessageWithMetadataAndBlockHash{
-			Message: message,
+			MessageWithMeta: message,
 		}
 		messages = append(messages, msgWithBlockHash)
 		msgToRead++

diff --git a/arbnode/transaction_streamer.go b/arbnode/transaction_streamer.go
@@ -468,8 +468,8 @@ func (s *TransactionStreamer) reorg(batch ethdb.Batch, count arbutil.MessageInde
 	messagesWithComputedBlockHash := make([]arbostypes.MessageWithMetadataAndBlockHash, 0, len(messagesResults))
 	for i := 0; i < len(messagesResults); i++ {
 		messagesWithComputedBlockHash = append(messagesWithComputedBlockHash, arbostypes.MessageWithMetadataAndBlockHash{
-			Message:   newMessages[i].Message,
-			BlockHash: &messagesResults[i].BlockHash,
+			MessageWithMeta: newMessages[i].MessageWithMeta,
+			BlockHash:       &messagesResults[i].BlockHash,
 		})
 	}
 	s.broadcastMessages(messagesWithComputedBlockHash, count)
@@ -589,8 +589,8 @@ func (s *TransactionStreamer) AddBroadcastMessages(feedMessages []*m.BroadcastFe
 			return fmt.Errorf("invalid feed message at sequence number %v", feedMessage.SequenceNumber)
 		}
 		msgWithBlockHash := arbostypes.MessageWithMetadataAndBlockHash{
-			Message:   feedMessage.Message,
-			BlockHash: feedMessage.BlockHash,
+			MessageWithMeta: feedMessage.Message,
+			BlockHash:       feedMessage.BlockHash,
 		}
 		messages = append(messages, msgWithBlockHash)
 		broadcastAfterPos++
@@ -611,7 +611,7 @@ func (s *TransactionStreamer) AddBroadcastMessages(feedMessages []*m.BroadcastFe
 	messages = messages[dups:]
 	broadcastStartPos += arbutil.MessageIndex(dups)
 	if oldMsg != nil {
-		s.logReorg(broadcastStartPos, oldMsg, &messages[0].Message, false)
+		s.logReorg(broadcastStartPos, oldMsg, &messages[0].MessageWithMeta, false)
 	}
 	if len(messages) == 0 {
 		// No new messages received
@@ -686,7 +686,7 @@ func (s *TransactionStreamer) AddFakeInitMessage() error {
 	chainIdBytes := arbmath.U256Bytes(s.chainConfig.ChainID)
 	msg := append(append(chainIdBytes, 0), chainConfigJson...)
 	return s.AddMessages(0, false, []arbostypes.MessageWithMetadataAndBlockHash{{
-		Message: arbostypes.MessageWithMetadata{
+		MessageWithMeta: arbostypes.MessageWithMetadata{
 			Message: &arbostypes.L1IncomingMessage{
 				Header: &arbostypes.L1IncomingMessageHeader{
 					Kind:      arbostypes.L1MessageType_Initialize,
@@ -775,7 +775,7 @@ func (s *TransactionStreamer) countDuplicateMessages(
 		if err != nil {
 			return 0, false, nil, err
 		}
-		nextMessage := messages[curMsg].Message
+		nextMessage := messages[curMsg].MessageWithMeta
 		wantMessage, err := rlp.EncodeToBytes(nextMessage)
 		if err != nil {
 			return 0, false, nil, err
@@ -867,7 +867,7 @@ func (s *TransactionStreamer) addMessagesAndEndBatchImpl(messageStartPos arbutil
 			return err
 		}
 		if duplicates > 0 {
-			lastDelayedRead = messages[duplicates-1].Message.DelayedMessagesRead
+			lastDelayedRead = messages[duplicates-1].MessageWithMeta.DelayedMessagesRead
 			messages = messages[duplicates:]
 			messageStartPos += arbutil.MessageIndex(duplicates)
 		}
@@ -905,13 +905,13 @@ func (s *TransactionStreamer) addMessagesAndEndBatchImpl(messageStartPos arbutil
 			return err
 		}
 		if duplicates > 0 {
-			lastDelayedRead = messages[duplicates-1].Message.DelayedMessagesRead
+			lastDelayedRead = messages[duplicates-1].MessageWithMeta.DelayedMessagesRead
 			messages = messages[duplicates:]
 			messageStartPos += arbutil.MessageIndex(duplicates)
 		}
 	}
 	if oldMsg != nil {
-		s.logReorg(messageStartPos, oldMsg, &messages[0].Message, confirmedReorg)
+		s.logReorg(messageStartPos, oldMsg, &messages[0].MessageWithMeta, confirmedReorg)
 	}
 
 	if feedReorg {
@@ -931,12 +931,12 @@ func (s *TransactionStreamer) addMessagesAndEndBatchImpl(messageStartPos arbutil
 	// Validate delayed message counts of remaining messages
 	for i, msg := range messages {
 		msgPos := messageStartPos + arbutil.MessageIndex(i)
-		diff := msg.Message.DelayedMessagesRead - lastDelayedRead
+		diff := msg.MessageWithMeta.DelayedMessagesRead - lastDelayedRead
 		if diff != 0 && diff != 1 {
-			return fmt.Errorf("attempted to insert jump from %v delayed messages read to %v delayed messages read at message index %v", lastDelayedRead, msg.Message.DelayedMessagesRead, msgPos)
+			return fmt.Errorf("attempted to insert jump from %v delayed messages read to %v delayed messages read at message index %v", lastDelayedRead, msg.MessageWithMeta.DelayedMessagesRead, msgPos)
 		}
-		lastDelayedRead = msg.Message.DelayedMessagesRead
-		if msg.Message.Message == nil {
+		lastDelayedRead = msg.MessageWithMeta.DelayedMessagesRead
+		if msg.MessageWithMeta.Message == nil {
 			return fmt.Errorf("attempted to insert nil message at position %v", msgPos)
 		}
 	}
@@ -1015,8 +1015,8 @@ func (s *TransactionStreamer) WriteMessageFromSequencer(
 	}
 
 	msgWithBlockHash := arbostypes.MessageWithMetadataAndBlockHash{
-		Message:   msgWithMeta,
-		BlockHash: &msgResult.BlockHash,
+		MessageWithMeta: msgWithMeta,
+		BlockHash:       &msgResult.BlockHash,
 	}
 
 	if err := s.writeMessages(pos, []arbostypes.MessageWithMetadataAndBlockHash{msgWithBlockHash}, nil); err != nil {
@@ -1071,7 +1071,7 @@ func (s *TransactionStreamer) writeMessages(pos arbutil.MessageIndex, messages [
 		batch = s.db.NewBatch()
 	}
 	for i, msg := range messages {
-		err := s.writeMessage(pos+arbutil.MessageIndex(i), msg.Message, batch)
+		err := s.writeMessage(pos+arbutil.MessageIndex(i), msg.MessageWithMeta, batch)
 		if err != nil {
 			return err
 		}
@@ -1153,8 +1153,8 @@ func (s *TransactionStreamer) ExecuteNextMsg(ctx context.Context, exec execution
 	}
 
 	msgWithBlockHash := arbostypes.MessageWithMetadataAndBlockHash{
-		Message:   *msg,
-		BlockHash: &msgResult.BlockHash,
+		MessageWithMeta: *msg,
+		BlockHash:       &msgResult.BlockHash,
 	}
 	s.broadcastMessages([]arbostypes.MessageWithMetadataAndBlockHash{msgWithBlockHash}, pos)
 

diff --git a/arbos/arbostypes/messagewithmeta.go b/arbos/arbostypes/messagewithmeta.go
@@ -19,8 +19,8 @@ type MessageWithMetadata struct {
 }
 
 type MessageWithMetadataAndBlockHash struct {
-	Message   MessageWithMetadata
-	BlockHash *common.Hash
+	MessageWithMeta MessageWithMetadata
+	BlockHash       *common.Hash
 }
 
 var EmptyTestMessageWithMetadata = MessageWithMetadata{

diff --git a/broadcaster/broadcaster.go b/broadcaster/broadcaster.go
@@ -104,7 +104,7 @@ func (b *Broadcaster) BroadcastMessages(
 	}()
 	var feedMessages []*m.BroadcastFeedMessage
 	for i, msg := range messagesWithBlockHash {
-		bfm, err := b.NewBroadcastFeedMessage(msg.Message, seq+arbutil.MessageIndex(i), msg.BlockHash)
+		bfm, err := b.NewBroadcastFeedMessage(msg.MessageWithMeta, seq+arbutil.MessageIndex(i), msg.BlockHash)
 		if err != nil {
 			return err
 		}

diff --git a/execution/gethexec/executionengine.go b/execution/gethexec/executionengine.go
@@ -149,9 +149,9 @@ func (s *ExecutionEngine) Reorg(count arbutil.MessageIndex, newMessages []arbost
 	for i := range newMessages {
 		var msgForPrefetch *arbostypes.MessageWithMetadata
 		if i < len(newMessages)-1 {
-			msgForPrefetch = &newMessages[i].Message
+			msgForPrefetch = &newMessages[i].MessageWithMeta
 		}
-		msgResult, err := s.digestMessageWithBlockMutex(count+arbutil.MessageIndex(i), &newMessages[i].Message, msgForPrefetch)
+		msgResult, err := s.digestMessageWithBlockMutex(count+arbutil.MessageIndex(i), &newMessages[i].MessageWithMeta, msgForPrefetch)
 		if err != nil {
 			return nil, err
 		}

diff --git a/system_tests/contract_tx_test.go b/system_tests/contract_tx_test.go
@@ -71,7 +71,7 @@ func TestContractTxDeploy(t *testing.T) {
 
 		err = builder.L2.ConsensusNode.TxStreamer.AddMessages(pos, true, []arbostypes.MessageWithMetadataAndBlockHash{
 			{
-				Message: arbostypes.MessageWithMetadata{
+				MessageWithMeta: arbostypes.MessageWithMetadata{
 					Message: &arbostypes.L1IncomingMessage{
 						Header: &arbostypes.L1IncomingMessageHeader{
 							Kind:        arbostypes.L1MessageType_L2Message,

diff --git a/system_tests/reorg_resequencing_test.go b/system_tests/reorg_resequencing_test.go
@@ -73,7 +73,7 @@ func TestReorgResequencing(t *testing.T) {
 		L2msg: append(builder.L2Info.GetAddress("User4").Bytes(), arbmath.Uint64ToU256Bytes(params.Ether)...),
 	}
 	err = builder.L2.ConsensusNode.TxStreamer.AddMessages(startMsgCount, true, []arbostypes.MessageWithMetadataAndBlockHash{{
-		Message: arbostypes.MessageWithMetadata{
+		MessageWithMeta: arbostypes.MessageWithMetadata{
 			Message:             newMessage,
 			DelayedMessagesRead: prevMessage.DelayedMessagesRead + 1,
 		},

diff --git a/system_tests/seq_coordinator_test.go b/system_tests/seq_coordinator_test.go
@@ -92,7 +92,7 @@ func TestRedisSeqCoordinatorPriorities(t *testing.T) {
 		}
 		Require(t, err)
 		emptyMessageWithBlockHash := arbostypes.MessageWithMetadataAndBlockHash{
-			Message: emptyMessage,
+			MessageWithMeta: emptyMessage,
 		}
 		Require(t, node.TxStreamer.AddMessages(curMsgs, false, []arbostypes.MessageWithMetadataAndBlockHash{emptyMessageWithBlockHash}))
 		return true