From bc62cfe22d73debc5991534214ea84cc4a0e990d Mon Sep 17 00:00:00 2001
From: William Banfield <wbanfield@gmail.com>
Date: Fri, 28 Oct 2022 17:27:11 -0400
Subject: [PATCH] unwrap messages in receive calls

---
 blockchain/v1/reactor.go           | 6 +++++-
 blockchain/v2/reactor.go           | 6 +++++-
 blocksync/reactor.go               | 6 +++++-
 consensus/reactor.go               | 6 +++++-
 mempool/v1/reactor.go              | 6 +++++-
 test/maverick/consensus/reactor.go | 6 +++++-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/blockchain/v1/reactor.go b/blockchain/v1/reactor.go
index 765a05904..c83703dd5 100644
--- a/blockchain/v1/reactor.go
+++ b/blockchain/v1/reactor.go
@@ -314,10 +314,14 @@ func (bcR *BlockchainReactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte)
 	if err != nil {
 		panic(err)
 	}
+	uw, err := msg.Unwrap()
+	if err != nil {
+		panic(err)
+	}
 	bcR.NewReceive(p2p.Envelope{
 		ChannelID: chID,
 		Src:       peer,
-		Message:   msg,
+		Message:   uw,
 	})
 }
 
diff --git a/blockchain/v2/reactor.go b/blockchain/v2/reactor.go
index 062841dba..f59d21339 100644
--- a/blockchain/v2/reactor.go
+++ b/blockchain/v2/reactor.go
@@ -521,10 +521,14 @@ func (r *BlockchainReactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {
 	if err != nil {
 		panic(err)
 	}
+	uw, err := msg.Unwrap()
+	if err != nil {
+		panic(err)
+	}
 	r.NewReceive(p2p.Envelope{
 		ChannelID: chID,
 		Src:       peer,
-		Message:   msg,
+		Message:   uw,
 	})
 }
 
diff --git a/blocksync/reactor.go b/blocksync/reactor.go
index 32ca8eb33..003ea9bca 100644
--- a/blocksync/reactor.go
+++ b/blocksync/reactor.go
@@ -241,10 +241,14 @@ func (bcR *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {
 	if err != nil {
 		panic(err)
 	}
+	uw, err := msg.Unwrap()
+	if err != nil {
+		panic(err)
+	}
 	bcR.NewReceive(p2p.Envelope{
 		ChannelID: chID,
 		Src:       peer,
-		Message:   msg,
+		Message:   uw,
 	})
 }
 
diff --git a/consensus/reactor.go b/consensus/reactor.go
index 17b8dc1ed..dd0e54324 100644
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@@ -394,10 +394,14 @@ func (conR *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {
 	if err != nil {
 		panic(err)
 	}
+	uw, err := msg.Unwrap()
+	if err != nil {
+		panic(err)
+	}
 	conR.NewReceive(p2p.Envelope{
 		ChannelID: chID,
 		Src:       peer,
-		Message:   msg,
+		Message:   uw,
 	})
 }
 
diff --git a/mempool/v1/reactor.go b/mempool/v1/reactor.go
index e761c54eb..203b76495 100644
--- a/mempool/v1/reactor.go
+++ b/mempool/v1/reactor.go
@@ -195,10 +195,14 @@ func (memR *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {
 	if err != nil {
 		panic(err)
 	}
+	uw, err := msg.Unwrap()
+	if err != nil {
+		panic(err)
+	}
 	memR.NewReceive(p2p.Envelope{
 		ChannelID: chID,
 		Src:       peer,
-		Message:   msg,
+		Message:   uw,
 	})
 }
 
diff --git a/test/maverick/consensus/reactor.go b/test/maverick/consensus/reactor.go
index f8f936843..32c90cda5 100644
--- a/test/maverick/consensus/reactor.go
+++ b/test/maverick/consensus/reactor.go
@@ -393,10 +393,14 @@ func (conR *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {
 	if err != nil {
 		panic(err)
 	}
+	um, err := msg.Unwrap()
+	if err != nil {
+		panic(err)
+	}
 	conR.NewReceive(p2p.Envelope{
 		ChannelID: chID,
 		Src:       peer,
-		Message:   msg,
+		Message:   um,
 	})
 }