D6697.diff
No OneTemporary
Actions

Size

1 KB

Subscribers

None

D6697.diff
View Options

	diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp
	--- a/src/script/script_error.cpp
	+++ b/src/script/script_error.cpp
	@@ -97,7 +97,7 @@
	case ScriptError::PUBKEYTYPE:
	return "Public key is neither compressed or uncompressed";
	case ScriptError::CLEANSTACK:
	- return "Script did not clean its stack";
	+ return "Extra items left on stack after execution";
	case ScriptError::ILLEGAL_FORKID:
	return "Illegal use of SIGHASH_FORKID";
	case ScriptError::MUST_USE_FORKID:
	diff --git a/test/functional/abc-segwit-recovery.py b/test/functional/abc-segwit-recovery.py
	--- a/test/functional/abc-segwit-recovery.py
	+++ b/test/functional/abc-segwit-recovery.py
	@@ -41,7 +41,7 @@
	TEST_TIME = int(time.time())

	# Error due to non clean stack
	-CLEANSTACK_ERROR = 'non-mandatory-script-verify-flag (Script did not clean its stack)'
	+CLEANSTACK_ERROR = 'non-mandatory-script-verify-flag (Extra items left on stack after execution)'
	RPC_CLEANSTACK_ERROR = CLEANSTACK_ERROR + " (code 64)"
	EVAL_FALSE_ERROR = 'non-mandatory-script-verify-flag (Script evaluated without error but finished with a false/empty top stack elem'
	RPC_EVAL_FALSE_ERROR = EVAL_FALSE_ERROR + "ent) (code 64)"