GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 1b045b5eef into merged_master (Bitcoin PR #21053)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-25 00:38:22 +00:00
commit 10a3ccdab4
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/rpc/blockchain.cpp
View file

@ -850,8 +850,8 @@ static RPCHelpMan getblockheader()
{RPCResult::Type::ELISION, "", "same entries as current"}
}},
}},
{RPCResult::Type::STR_HEX, "previousblockhash", "The hash of the previous block"},
{RPCResult::Type::STR_HEX, "nextblockhash", "The hash of the next block"},
{RPCResult::Type::STR_HEX, "previousblockhash", /* optional */ true, "The hash of the previous block (if available)"},
{RPCResult::Type::STR_HEX, "nextblockhash", /* optional */ true, "The hash of the next block (if available)"},
}},
RPCResult{"for verbose=false",
RPCResult::Type::STR_HEX, "", "A string that is serialized, hex-encoded data for block 'hash'"},
@ -977,8 +977,8 @@ static RPCHelpMan getblock()
{RPCResult::Type::ELISION, "", "same entries as current"}
}},
}},
{RPCResult::Type::STR_HEX, "previousblockhash", "The hash of the previous block"},
{RPCResult::Type::STR_HEX, "nextblockhash", "The hash of the next block"},
{RPCResult::Type::STR_HEX, "previousblockhash", /* optional */ true, "The hash of the previous block (if available)"},
{RPCResult::Type::STR_HEX, "nextblockhash", /* optional */ true, "The hash of the next block (if available)"},
}},
RPCResult{"for verbosity = 2",
RPCResult::Type::OBJ, "", "",

10
test/functional/wallet_signer.py
View file

@ -9,7 +9,7 @@ Verify that a bitcoind node can use an external signer command
import os
import platform
from test_framework.test_framework import BitcoinTestFramework
from test_framework.test_framework import BitcoinTestFramework, SkipTest
from test_framework.util import (
assert_equal,
assert_raises_rpc_error,
@ -37,6 +37,7 @@ class SignerTest(BitcoinTestFramework):
def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
self.skip_if_no_external_signer()
raise SkipTest("ELEMENTS: see `git blame` on this line of code for more info")
def set_mock_result(self, node, res):
with open(os.path.join(node.cwd, "mock_result"), "w", encoding="utf8") as f:
@ -202,10 +203,9 @@ class SignerTest(BitcoinTestFramework):
self.log.info('Test send using hww1')
# ELEMENTS: these lines are ridiculous. See `git blame` for more detail.
#res = hww.send(outputs={dest:0.5},options={"add_to_wallet": False})
#assert(res["complete"])
#assert_equal(res["hex"], mock_tx)
res = hww.send(outputs={dest:0.5},options={"add_to_wallet": False})
assert(res["complete"])
assert_equal(res["hex"], mock_tx)
# # Handle error thrown by script
# self.set_mock_result(self.nodes[4], "2")