Merge #13965: tests: Fix extended functional tests fail

a9cf5c9623 Import CInv from correct module (Chun Kuan Lee)

Pull request description:

  Fix extended tests fail

  https://travis-ci.org/bitcoin/bitcoin/builds/415574232

Tree-SHA512: 1dd8cd3854ddf4d8c2f4cb700c2b4d866c0890b57c2e0cf73a38b97fbbd13c8c6149a8914c9d03453b4625873241cc3d470f069dd1918cf360d10ad5d79d717f
This commit is contained in:
MarcoFalke 2018-08-14 07:53:40 -04:00
commit dabfcb0307
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25

View file

@ -15,8 +15,8 @@ from collections import defaultdict
# Avoid wildcard * imports if possible
from test_framework.blocktools import (create_block, create_coinbase)
from test_framework.messages import CInv
from test_framework.mininode import (
CInv,
P2PInterface,
mininode_lock,
msg_block,