diff options
author | Ava Chow <github@achow101.com> | 2024-07-02 17:49:32 -0400 |
---|---|---|
committer | Ava Chow <github@achow101.com> | 2024-07-02 17:49:32 -0400 |
commit | 3325a0afa45ee88c9e859f1002183f1bd61868da (patch) | |
tree | 9fd7c07e064f118ce45b476fb399629d23f83757 /test/functional/wallet_create_tx.py | |
parent | 9251bc71110412ff248ee99fbb215d84b60c8c7c (diff) | |
parent | 926b8e39dcbc0a3a8a75ef0a29bdca2bf738d746 (diff) | |
download | bitcoin-3325a0afa45ee88c9e859f1002183f1bd61868da.tar.xz |
Merge bitcoin/bitcoin#30272: doc: use TRUC instead of v3 and add release note
926b8e39dcbc0a3a8a75ef0a29bdca2bf738d746 [doc] add release note for TRUC (glozow)
19a9b90617419f68d0f1c90ee115b5220be99a16 use version=3 instead of v3 in debug strings (glozow)
881fac8e609be17eb71bd9a54c0284b304e2e2e2 scripted-diff: change names from V3 to TRUC (glozow)
a573dd261748d2a80560f73db08f7dca788c7fcf [doc] replace mentions of v3 with TRUC (glozow)
089b5757dff39a9a06cdb625aaced9beeb72958d rename mempool_accept_v3.py to mempool_truc.py (glozow)
f543852a89d93441645250c40c3980aeb0c3b664 rename policy/v3_policy.* to policy/truc_policy.* (glozow)
Pull request description:
Adds a release note for TRUC policy which will be live in v28.0.
For clarity, replaces mentions of "v3" with "TRUC" in most places. Suggested in
- https://github.com/bitcoin/bitcoin/pull/29496#discussion_r1629749583
- https://github.com/bitcoin/bitcoin/pull/29496#discussion_r1624500904
I changed error strings from "v3-violation" to "TRUC-violation" but left v3 in the debug strings because I think it might be clearer for somebody who is debugging. Similarly, I left some variables unchanged because I think they're more descriptive this way, e.g. `tx_v3_from_v2_and_v3`. I'm happy to debate places that should or shouldn't be documented differently in this PR, whatever is clearest to everyone.
ACKs for top commit:
instagibbs:
reACK https://github.com/bitcoin/bitcoin/pull/30272/commits/926b8e39dcbc0a3a8a75ef0a29bdca2bf738d746
achow101:
ACK 926b8e39dcbc0a3a8a75ef0a29bdca2bf738d746
ismaelsadeeq:
Code review ACK 926b8e39dcbc0a3a8a75ef0a29bdca2bf738d746
Tree-SHA512: 16c88add0a29dc6d1236c4d45f34a17b850f6727b231953cbd52eb9f7268d1d802563eadfc8b7928c94ed3d7a615275dd103e57e81439ebf3ba2b12efa1e42af
Diffstat (limited to 'test/functional/wallet_create_tx.py')
-rwxr-xr-x | test/functional/wallet_create_tx.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/wallet_create_tx.py b/test/functional/wallet_create_tx.py index fa3e920c25..41ddb2bc69 100755 --- a/test/functional/wallet_create_tx.py +++ b/test/functional/wallet_create_tx.py @@ -114,16 +114,16 @@ class CreateTxWalletTest(BitcoinTestFramework): self.log.info('Check wallet does not create transactions with version=3 yet') wallet_rpc = self.nodes[0].get_wallet_rpc(self.default_wallet_name) - self.nodes[0].createwallet("v3") - wallet_v3 = self.nodes[0].get_wallet_rpc("v3") + self.nodes[0].createwallet("version3") + wallet_v3 = self.nodes[0].get_wallet_rpc("version3") tx_data = wallet_rpc.send(outputs=[{wallet_v3.getnewaddress(): 25}], options={"change_position": 0}) wallet_tx_data = wallet_rpc.gettransaction(tx_data["txid"]) tx_current_version = tx_from_hex(wallet_tx_data["hex"]) - # While v3 transactions are standard, the CURRENT_VERSION is 2. + # While version=3 transactions are standard, the CURRENT_VERSION is 2. # This test can be removed if CURRENT_VERSION is changed, and replaced with tests that the - # wallet handles v3 rules properly. + # wallet handles TRUC rules properly. assert_equal(tx_current_version.version, 2) wallet_v3.unloadwallet() |