message: [QA] extend wallet-hd test to cover HD metadata
diff: @@ -36,6 +36,10 @@ class WalletHDTest(BitcoinTestFramework):
  def run_test (self):
  tmpdir = self.options.tmpdir
  + # Make sure we use hd, keep masterkeyid
  + masterkeyid = self.nodes[1].getwalletinfo()['masterkeyid']
  + assert_equal(len(masterkeyid), 40)
  +
  # Import a non-HD private key in the HD wallet
  non_hd_add = self.nodes[0].getnewaddress()
  self.nodes[1].importprivkey(self.nodes[0].dumpprivkey(non_hd_add))
  @@ -52,6 +56,9 @@ class WalletHDTest(BitcoinTestFramework):
  num_hd_adds = 300
  for _ in range(num_hd_adds):
  hd_add = self.nodes[1].getnewaddress()
  + hd_info = self.nodes[1].validateaddress(hd_add)
  + assert_equal(hd_info["hdkeypath"], "m/0'/0'/"+str(_+1)+"'")
  + assert_equal(hd_info["hdmasterkeyid"], masterkeyid)
  self.nodes[0].sendtoaddress(hd_add, 1)
  self.nodes[0].generate(1)
  self.nodes[0].sendtoaddress(non_hd_add, 1)
  @@ -71,6 +78,9 @@ class WalletHDTest(BitcoinTestFramework):
  hd_add_2 = None
  for _ in range(num_hd_adds):
  hd_add_2 = self.nodes[1].getnewaddress()
  + hd_info_2 = self.nodes[1].validateaddress(hd_add_2)
  + assert_equal(hd_info_2["hdkeypath"], "m/0'/0'/"+str(_+1)+"'")
  + assert_equal(hd_info_2["hdmasterkeyid"], masterkeyid)
  assert_equal(hd_add, hd_add_2)
  # Needs rescan
  