blockchain: Consolidate not in main chain err fmt. #3492
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This consolidates the error formatting logic for the various cases when a block that is not in the main chain is requested either by height or hash.
Rather than having a single generic error string that represents the various cases and repeatedly formatting the errors at each call site, this introduces two individual errors of the appropriate types and moves the error formatting onto the types.
It also updates the tests to remove
isNotInMainChainErr
which is a holdover that is no longer needed due to previous changes, as well as to ensure the new formatted error strings are the expected output.