Skip to content

Commit 9e7b23b

Browse files
committed
Improve TransactionErrorString messages.
1 parent 057bd31 commit 9e7b23b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/util/error.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bilingual_str TransactionErrorString(const TransactionError err)
1414
case TransactionError::OK:
1515
return Untranslated("No error");
1616
case TransactionError::MISSING_INPUTS:
17-
return Untranslated("Missing inputs");
17+
return Untranslated("Inputs missing or spent");
1818
case TransactionError::ALREADY_IN_CHAIN:
1919
return Untranslated("Transaction already in block chain");
2020
case TransactionError::P2P_DISABLED:
@@ -24,11 +24,11 @@ bilingual_str TransactionErrorString(const TransactionError err)
2424
case TransactionError::MEMPOOL_ERROR:
2525
return Untranslated("AcceptToMemoryPool failed");
2626
case TransactionError::INVALID_PSBT:
27-
return Untranslated("PSBT is not sane");
27+
return Untranslated("PSBT is not well-formed");
2828
case TransactionError::PSBT_MISMATCH:
2929
return Untranslated("PSBTs not compatible (different transactions)");
3030
case TransactionError::SIGHASH_MISMATCH:
31-
return Untranslated("Specified sighash value does not match existing value");
31+
return Untranslated("Specified sighash value does not match value stored in PSBT");
3232
case TransactionError::MAX_FEE_EXCEEDED:
3333
return Untranslated("Fee exceeds maximum configured by -maxtxfee");
3434
// no default case, so the compiler can warn about missing cases

test/functional/rpc_psbt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ def test_psbt_input_keys(psbt_input, keys):
467467
assert_equal(analysis['next'], 'creator')
468468
assert_equal(analysis['error'], 'PSBT is not valid. Input 0 specifies invalid prevout')
469469

470-
assert_raises_rpc_error(-25, 'Missing inputs', self.nodes[0].walletprocesspsbt, 'cHNidP8BAJoCAAAAAkvEW8NnDtdNtDpsmze+Ht2LH35IJcKv00jKAlUs21RrAwAAAAD/////S8Rbw2cO1020OmybN74e3Ysffkglwq/TSMoCVSzbVGsBAAAAAP7///8CwLYClQAAAAAWABSNJKzjaUb3uOxixsvh1GGE3fW7zQD5ApUAAAAAFgAUKNw0x8HRctAgmvoevm4u1SbN7XIAAAAAAAEAnQIAAAACczMa321tVHuN4GKWKRncycI22aX3uXgwSFUKM2orjRsBAAAAAP7///9zMxrfbW1Ue43gYpYpGdzJwjbZpfe5eDBIVQozaiuNGwAAAAAA/v///wIA+QKVAAAAABl2qRT9zXUVA8Ls5iVqynLHe5/vSe1XyYisQM0ClQAAAAAWABRmWQUcjSjghQ8/uH4Bn/zkakwLtAAAAAAAAQEfQM0ClQAAAAAWABRmWQUcjSjghQ8/uH4Bn/zkakwLtAAAAA==')
470+
assert_raises_rpc_error(-25, 'Inputs missing or spent', self.nodes[0].walletprocesspsbt, 'cHNidP8BAJoCAAAAAkvEW8NnDtdNtDpsmze+Ht2LH35IJcKv00jKAlUs21RrAwAAAAD/////S8Rbw2cO1020OmybN74e3Ysffkglwq/TSMoCVSzbVGsBAAAAAP7///8CwLYClQAAAAAWABSNJKzjaUb3uOxixsvh1GGE3fW7zQD5ApUAAAAAFgAUKNw0x8HRctAgmvoevm4u1SbN7XIAAAAAAAEAnQIAAAACczMa321tVHuN4GKWKRncycI22aX3uXgwSFUKM2orjRsBAAAAAP7///9zMxrfbW1Ue43gYpYpGdzJwjbZpfe5eDBIVQozaiuNGwAAAAAA/v///wIA+QKVAAAAABl2qRT9zXUVA8Ls5iVqynLHe5/vSe1XyYisQM0ClQAAAAAWABRmWQUcjSjghQ8/uH4Bn/zkakwLtAAAAAAAAQEfQM0ClQAAAAAWABRmWQUcjSjghQ8/uH4Bn/zkakwLtAAAAA==')
471471

472472
if __name__ == '__main__':
473473
PSBTTest().main()

0 commit comments

Comments
 (0)