mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 06:52:36 +01:00
Code Issues Projects Releases Wiki Activity

miniscript: nit: don't return after assert(false)

Browse source
This commit is contained in:
Antoine Poinsot 2022-05-16 15:24:03 +02:00
parent 7bbaca9d8d
commit c5fe5163dc
No known key found for this signature in database
GPG key ID: E13FC145CD3F4304
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/script/miniscript.cpp
View file

@ -245,7 +245,6 @@ Type ComputeType(Fragment fragment, Type x, Type y, Type z, const std::vector<Ty
} }
} }
assert(false); assert(false);
return ""_mst;
} }
size_t ComputeScriptLen(Fragment fragment, Type sub0typ, size_t subsize, uint32_t k, size_t n_subs, size_t n_keys) { size_t ComputeScriptLen(Fragment fragment, Type sub0typ, size_t subsize, uint32_t k, size_t n_subs, size_t n_keys) {
@ -278,7 +277,6 @@ size_t ComputeScriptLen(Fragment fragment, Type sub0typ, size_t subsize, uint32_
case Fragment::THRESH: return subsize + n_subs + BuildScript(k).size(); case Fragment::THRESH: return subsize + n_subs + BuildScript(k).size();
} }
assert(false); assert(false);
return 0;
} }
std::optional<std::vector<Opcode>> DecomposeScript(const CScript& script) std::optional<std::vector<Opcode>> DecomposeScript(const CScript& script)

7
src/script/miniscript.h
View file

@ -532,7 +532,6 @@ public:
} }
} }
assert(false); assert(false);
return {};
}; };
return TreeEval<CScript>(false, downfn, upfn); return TreeEval<CScript>(false, downfn, upfn);
} }
@ -632,9 +631,9 @@ public:
} }
return std::move(str) + ")"; return std::move(str) + ")";
} }
default: assert(false); default: break;
} }
return ""; // Should never be reached. assert(false);
}; };
return TreeEvalMaybe<std::string>(false, downfn, upfn); return TreeEvalMaybe<std::string>(false, downfn, upfn);
@ -711,7 +710,6 @@ public:
} }
} }
assert(false); assert(false);
return {0, {}, {}};
} }
internal::StackSize CalcStackSize() const { internal::StackSize CalcStackSize() const {
@ -762,7 +760,6 @@ public:
} }
} }
assert(false); assert(false);
return {{}, {}};
} }
/** Check whether any key is repeated. /** Check whether any key is repeated.