[bitcoin/bitcoin] Return the script type from Solver (#13429)

On second look realized I had not previously removed the unnecessary if noted by @achow101. Removed that, and reviewed to check that there were no unexpected changes relative to 3670931.

This post was last modified on July 6, 2018, 6:47 am