From cacd85209e20fc0fd08f86eed23b6ef93484ffcf Mon Sep 17 00:00:00 2001
From: Fabian Jahr <fjahr@protonmail.com>
Date: Tue, 21 Apr 2020 17:02:46 +0200
Subject: test: Use wtxid relay generally in functional tests

---
 test/functional/p2p_segwit.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'test/functional/p2p_segwit.py')

diff --git a/test/functional/p2p_segwit.py b/test/functional/p2p_segwit.py
index 9286f3e606..9915b844d1 100755
--- a/test/functional/p2p_segwit.py
+++ b/test/functional/p2p_segwit.py
@@ -36,7 +36,6 @@ from test_framework.messages import (
     msg_block,
     msg_no_witness_tx,
     msg_verack,
-    msg_wtxidrelay,
     ser_uint256,
     ser_vector,
     sha256,
@@ -161,8 +160,10 @@ class TestP2PConn(P2PInterface):
 
     def on_version(self, message):
         if self.wtxidrelay:
-            self.send_message(msg_wtxidrelay())
-        super().on_version(message)
+            super().on_version(message)
+        else:
+            self.send_message(msg_verack())
+            self.nServices = message.nServices
 
     def on_getdata(self, message):
         self.lastgetdata = message.inv
-- 
cgit v1.2.3