From bbb50514af1e303a969da077690ffb0c4e14889e 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

---
 p2p/pex/pex_reactor.go | 6 +++++-
 p2p/switch_test.go     | 7 ++++++-
 statesync/reactor.go   | 7 ++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/p2p/pex/pex_reactor.go b/p2p/pex/pex_reactor.go
index ae1695cda..f7ffad721 100644
--- a/p2p/pex/pex_reactor.go
+++ b/p2p/pex/pex_reactor.go
@@ -306,10 +306,14 @@ func (r *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {
 	if err != nil {
 		panic(err)
 	}
+	um, err := msg.Unwrap()
+	if err != nil {
+		panic(err)
+	}
 	r.NewReceive(p2p.Envelope{
 		ChannelID: chID,
 		Src:       peer,
-		Message:   msg,
+		Message:   um,
 	})
 }
 
diff --git a/p2p/switch_test.go b/p2p/switch_test.go
index b577d6562..24c2317cc 100644
--- a/p2p/switch_test.go
+++ b/p2p/switch_test.go
@@ -87,10 +87,15 @@ func (tr *TestReactor) Receive(chID byte, peer Peer, msgBytes []byte) {
 	if err != nil {
 		panic(err)
 	}
+	um, err := msg.Unwrap()
+	if err != nil {
+		panic(err)
+	}
+
 	tr.NewReceive(Envelope{
 		ChannelID: chID,
 		Src:       peer,
-		Message:   msg,
+		Message:   um,
 	})
 }
 
diff --git a/statesync/reactor.go b/statesync/reactor.go
index e5f83b835..f1c195531 100644
--- a/statesync/reactor.go
+++ b/statesync/reactor.go
@@ -231,10 +231,15 @@ func (r *Reactor) Receive(chID byte, peer p2p.Peer, msgBytes []byte) {
 	if err != nil {
 		panic(err)
 	}
+	um, err := msg.Unwrap()
+	if err != nil {
+		panic(err)
+	}
+
 	r.NewReceive(p2p.Envelope{
 		ChannelID: chID,
 		Src:       peer,
-		Message:   msg,
+		Message:   um,
 	})
 }