[Tests] Use blockmaxweight where tests previously had blockmaxsize #12790

 139 | +                                      ["-blockmaxweight=32000", "-maxorphantx=1000"]])
 140 |          # Use node0 to mine blocks for input splitting
 141 |          # Node1 mines small blocks but that are bigger than the expected transaction rate.
 142 |          # NOTE: the CreateNewBlock code starts counting block size at 1,000 bytes,
 143 | -        # (17k is room enough for 110 or so transactions)
 144 | +        # (68k weight is room enough for 120 or so transactions)

conscott commented at 1:24 PM on March 26, 2018:

I have verified these numbers are still correct.

jnewbery commented at 3:04 PM on March 26, 2018:

Good! Is this test using segwit or legacy transactions? I assume that would have an impact on these numbers?

conscott commented at 3:37 PM on March 26, 2018:

Legacy P2SH - so just a simple WITNESS_SCALE_FACTOR for all txs.

  34 | +
  35 |      def set_test_params(self):
  36 |          self.setup_clean_chain = True
  37 |          self.num_nodes = 1
  38 | -        self.extra_args = [["-maxuploadtarget=800"]]
  39 | +        self.extra_args = [["-maxuploadtarget=800", "-blockmaxweight=3996000"]]

conscott commented at 1:45 PM on March 26, 2018:

May just remove these, since it's the default, but the limit was explicitly added in the original test.

jnewbery commented at 2:55 PM on March 26, 2018:

I agree that we should just remove this - there's no point in explicitly setting config to the default value (in fact it just distracts from the purpose of the test).

 137 | -                                      ["-maxorphantx=1000"]])
 138 | +                                      ["-blockmaxweight=68000", "-maxorphantx=1000"],
 139 | +                                      ["-blockmaxweight=32000", "-maxorphantx=1000"]])
 140 |          # Use node0 to mine blocks for input splitting
 141 |          # Node1 mines small blocks but that are bigger than the expected transaction rate.
 142 |          # NOTE: the CreateNewBlock code starts counting block size at 1,000 bytes,

jnewbery commented at 3:04 PM on March 26, 2018:

This comment can be updated to say "CreateNewBlock code starts counting block weight at 4,000 weight"

 142 | -        # NOTE: the CreateNewBlock code starts counting block size at 1,000 bytes,
 143 | -        # (17k is room enough for 110 or so transactions)
 144 | +        # NOTE: the CreateNewBlock code starts counting block weight at 4,000 weight,
 145 | +        # (68k weight is room enough for 120 or so transactions)
 146 |          # Node2 is a stingy miner, that
 147 |          # produces too small blocks (room for only 55 or so transactions)

jnewbery commented at 3:43 PM on March 26, 2018:

Is this number still correct?

conscott commented at 3:52 PM on March 26, 2018:

Yes. I tested this as well.

  30 | @@ -31,14 +31,14 @@ def set_test_params(self):
  31 |  
  32 |          # Create nodes 0 and 1 to mine.
  33 |          # Create node 2 to test pruning.
  34 | -        self.full_node_default_args = ["-maxreceivebuffer=20000", "-checkblocks=5", "-limitdescendantcount=100", "-limitdescendantsize=5000", "-limitancestorcount=100", "-limitancestorsize=5000" ]
  35 | +        self.full_node_default_args = ["-maxreceivebuffer=20000", "-blockmaxweight=3996000", "-checkblocks=5", "-limitdescendantcount=100", "-limitdescendantsize=5000", "-limitancestorcount=100", "-limitancestorsize=5000"]

jnewbery commented at 3:44 PM on March 26, 2018:

I think this change can be removed

  39 |                             self.full_node_default_args,
  40 |                             ["-maxreceivebuffer=20000", "-prune=550"],
  41 | -                           ["-maxreceivebuffer=20000"],
  42 | -                           ["-maxreceivebuffer=20000"],
  43 | +                           ["-maxreceivebuffer=20000", "-blockmaxweight=3996000"],
  44 | +                           ["-maxreceivebuffer=20000", "-blockmaxweight=3996000"],

jnewbery commented at 3:44 PM on March 26, 2018:

I think this change can be removed