WIP: fix functional tests

Author: stevenroose

src/init.cpp

@@ -888,11 +888,6 @@ void InitParameterInteraction()
     for (const auto& arg : gArgs.GetUnsuitableSectionOnlyArgs()) {
         InitWarning(strprintf(_("Config setting for %s only applied on %s network when in [%s] section."), arg, network, network));
     }
-
-    // Warn if unrecognized section name are present in the config file.
-    for (const auto& section : gArgs.GetUnrecognizedSections()) {
-        InitWarning(strprintf(_("Section [%s] is not recognized."), section));
-    }
 }
 
 static std::string ResolveErrMsg(const char * const optname, const std::string& strBind)

test/functional/data/invalid_txs.py

@@ -47,7 +47,7 @@ class BadTxTemplate:
 
     def __init__(self, *, spend_tx=None, spend_block=None):
         self.spend_tx = spend_block.vtx[0] if spend_block else spend_tx
-        self.spend_avail = sum(o.nValue for o in self.spend_tx.vout)
+        self.spend_avail = sum(o.nValue.getAmount() for o in self.spend_tx.vout)
         self.valid_txin = CTxIn(COutPoint(self.spend_tx.sha256, 0), b"", 0xffffffff)
 
     @abc.abstractmethod
@@ -135,7 +135,8 @@ def get_tx(self):
 
 
 class SpendTooMuch(BadTxTemplate):
-    reject_reason = 'bad-txns-in-belowout'
+    # ELEMENTS: block amount checks are queued, so this is an aggregated error code
+    reject_reason = 'block-validation-failed'
     expect_disconnect = True
 
     def get_tx(self):

test/functional/feature_mandatory_coinbase.py

@@ -23,7 +23,7 @@ def b2x(b):
 def assert_template(node, block, expect, rehash=True):
     if rehash:
         block.hashMerkleRoot = block.calc_merkle_root()
-    rsp = node.getblocktemplate({'data': b2x(block.serialize()), 'mode': 'proposal'})
+    rsp = node.getblocktemplate({'data': b2x(block.serialize()), 'mode': 'proposal', 'rules': 'segwit'})
     assert_equal(rsp, expect)
 
 class MandatoryCoinbaseTest(BitcoinTestFramework):
@@ -51,7 +51,7 @@ def run_test(self):
 
         # Have non-mandatory node make a template
         self.sync_all()
-        tmpl = node1.getblocktemplate()
+        tmpl = node1.getblocktemplate({'rules': 'segwit'})
 
         # We make a block with OP_TRUE coinbase output that will fail on node0
         coinbase_tx = create_coinbase(height=int(tmpl["height"]))
@@ -86,7 +86,7 @@ def run_test(self):
         #
         # Also test that coinbases can't have fees.
         self.sync_all()
-        tmpl = node1.getblocktemplate()
+        tmpl = node1.getblocktemplate({'rules': 'segwit'})
         coinbase_tx = create_coinbase(height=int(tmpl["height"]))
         # sequence numbers must not be max for nLockTime to have effect
         coinbase_tx.vin[0].nSequence = 2 ** 32 - 2

test/functional/test_framework/messages.py

@@ -716,7 +716,6 @@ def deserialize(self, f):
             self.wit = CTxWitness()
         if flags > 1:
             raise TypeError('Extra witness flags:' + str(flags))
-        self.nLockTime = struct.unpack("<I", f.read(4))[0]
         self.sha256 = None
         self.hash = None
 
@@ -907,7 +906,7 @@ def __repr__(self):
                time.ctime(self.nTime), self.block_height)
 
 BLOCK_HEADER_SIZE = len(CBlockHeader().serialize())
-assert_equal(BLOCK_HEADER_SIZE, 80)
+assert_equal(BLOCK_HEADER_SIZE, 79)
 
 class CBlock(CBlockHeader):
     __slots__ = ("vtx",)