lukechilds
/
miniscript
mirror of https://github.com/lukechilds/miniscript.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixup compiler and js wrapper for TRUE/FALSE rename

master
Pieter Wuille 5 years ago
parent
9de79d20c0
commit
20d30ff377
2 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      compiler.cpp
  2. 4
      js_bindings.cpp

30
compiler.cpp
View File

@ -175,7 +175,7 @@ Policy Parse(const std::string& in) {
struct Strat { struct Strat {
enum class Type { enum class Type {
FALSE, TRUE, JUST_0, JUST_1,
PK, THRESH_M, PK, THRESH_M,
OLDER, AFTER, OLDER, AFTER,
HASH160, HASH256, SHA256, RIPEMD160, HASH160, HASH256, SHA256, RIPEMD160,
@ -231,8 +231,8 @@ const Strat* GetStrategy(const Policy& node, std::unordered_map<const Policy*, c
} }
static StratStore STRAT_GLOBAL; static StratStore STRAT_GLOBAL;
static const Strat* STRAT_FALSE = MakeStrat(STRAT_GLOBAL, Strat::Type::CACHE, Vector(MakeStrat(STRAT_GLOBAL, Strat::Type::FALSE))); static const Strat* STRAT_FALSE = MakeStrat(STRAT_GLOBAL, Strat::Type::CACHE, Vector(MakeStrat(STRAT_GLOBAL, Strat::Type::JUST_0)));
static const Strat* STRAT_TRUE = MakeStrat(STRAT_GLOBAL, Strat::Type::CACHE, Vector(MakeStrat(STRAT_GLOBAL, Strat::Type::TRUE))); static const Strat* STRAT_TRUE = MakeStrat(STRAT_GLOBAL, Strat::Type::CACHE, Vector(MakeStrat(STRAT_GLOBAL, Strat::Type::JUST_1)));
const Strat* ComputeStrategy(const Policy& node, std::unordered_map<const Policy*, const Strat*>& cache, StratStore& store) { const Strat* ComputeStrategy(const Policy& node, std::unordered_map<const Policy*, const Strat*>& cache, StratStore& store) {
std::vector<const Strat*> strats; std::vector<const Strat*> strats;
@ -481,8 +481,8 @@ CostPair CalcCostPair(NodeType nt, const std::vector<const Result*>& s, double l
case NodeType::WRAP_D: return {2 + s[0]->pair.sat, 1}; case NodeType::WRAP_D: return {2 + s[0]->pair.sat, 1};
case NodeType::WRAP_V: return {s[0]->pair.sat, INF}; case NodeType::WRAP_V: return {s[0]->pair.sat, INF};
case NodeType::WRAP_J: return {s[0]->pair.sat, 1}; case NodeType::WRAP_J: return {s[0]->pair.sat, 1};
case NodeType::TRUE: return {0, INF}; case NodeType::JUST_1: return {0, INF};
case NodeType::FALSE: return {INF, 0}; case NodeType::JUST_0: return {INF, 0};
case NodeType::AND_V: return {s[0]->pair.sat + s[1]->pair.sat, INF}; case NodeType::AND_V: return {s[0]->pair.sat + s[1]->pair.sat, INF};
case NodeType::AND_B: return {s[0]->pair.sat + s[1]->pair.sat, s[0]->pair.nsat + s[1]->pair.nsat}; case NodeType::AND_B: return {s[0]->pair.sat + s[1]->pair.sat, s[0]->pair.nsat + s[1]->pair.nsat};
case NodeType::OR_B: case NodeType::OR_B:
@ -511,8 +511,8 @@ std::pair<std::vector<double>, std::vector<double>> GetPQs(NodeType nt, double p
static const std::pair<std::vector<double>, std::vector<double>> NONE; static const std::pair<std::vector<double>, std::vector<double>> NONE;
double r = 1.0 - l; double r = 1.0 - l;
switch (nt) { switch (nt) {
case NodeType::TRUE: case NodeType::JUST_1:
case NodeType::FALSE: case NodeType::JUST_0:
case NodeType::PK: case NodeType::PK:
case NodeType::PK_H: case NodeType::PK_H:
case NodeType::THRESH_M: case NodeType::THRESH_M:
@ -578,8 +578,8 @@ const TypeFilters& GetTypeFilter(NodeType nt) {
}; };
switch (nt) { switch (nt) {
case NodeType::TRUE: case NodeType::JUST_1:
case NodeType::FALSE: case NodeType::JUST_0:
case NodeType::PK: case NodeType::PK:
case NodeType::PK_H: case NodeType::PK_H:
case NodeType::THRESH_M: case NodeType::THRESH_M:
@ -691,11 +691,11 @@ void Compile(const Strat* strat, Compilation& compilation, std::map<CompilationK
} }
return; return;
} }
case Strat::Type::FALSE: case Strat::Type::JUST_0:
Add(compilation, cache, NodeType::FALSE, strat->sub, 0, 0); Add(compilation, cache, NodeType::JUST_0, strat->sub, 0, 0);
return; return;
case Strat::Type::TRUE: case Strat::Type::JUST_1:
Add(compilation, cache, NodeType::TRUE, strat->sub, 0, 0); Add(compilation, cache, NodeType::JUST_1, strat->sub, 0, 0);
return; return;
case Strat::Type::AFTER: case Strat::Type::AFTER:
case Strat::Type::OLDER: { case Strat::Type::OLDER: {
@ -886,8 +886,8 @@ std::string DebugNode(const Node& node) {
case NodeType::HASH256: return "hash256"; case NodeType::HASH256: return "hash256";
case NodeType::RIPEMD160: return "ripemd160"; case NodeType::RIPEMD160: return "ripemd160";
case NodeType::HASH160: return "hash160"; case NodeType::HASH160: return "hash160";
case NodeType::TRUE: return "1"; case NodeType::JUST_1: return "1";
case NodeType::FALSE: return "0"; case NodeType::JUST_0: return "0";
case NodeType::WRAP_C: return "c:"; case NodeType::WRAP_C: return "c:";
case NodeType::WRAP_A: return "a:"; case NodeType::WRAP_A: return "a:";
case NodeType::WRAP_S: return "s:"; case NodeType::WRAP_S: return "s:";

4
js_bindings.cpp
View File

@ -58,8 +58,8 @@ std::string Analyze(const miniscript::NodeRef<std::string>& node) {
case miniscript::NodeType::RIPEMD160: return Props(node, "ripemd160()"); case miniscript::NodeType::RIPEMD160: return Props(node, "ripemd160()");
case miniscript::NodeType::HASH256: return Props(node, "hash256()"); case miniscript::NodeType::HASH256: return Props(node, "hash256()");
case miniscript::NodeType::HASH160: return Props(node, "hash160()"); case miniscript::NodeType::HASH160: return Props(node, "hash160()");
case miniscript::NodeType::FALSE: return Props(node, "false"); case miniscript::NodeType::JUST_0: return Props(node, "false");
case miniscript::NodeType::TRUE: return Props(node, "true"); case miniscript::NodeType::JUST_1: return Props(node, "true");
case miniscript::NodeType::WRAP_A: return Props(node, "a:") + " " + Analyze(node->subs[0]); case miniscript::NodeType::WRAP_A: return Props(node, "a:") + " " + Analyze(node->subs[0]);
case miniscript::NodeType::WRAP_S: return Props(node, "s:") + " " + Analyze(node->subs[0]); case miniscript::NodeType::WRAP_S: return Props(node, "s:") + " " + Analyze(node->subs[0]);
case miniscript::NodeType::WRAP_C: return Props(node, "c:") + " " + Analyze(node->subs[0]); case miniscript::NodeType::WRAP_C: return Props(node, "c:") + " " + Analyze(node->subs[0]);

Write Preview
Loading…
Cancel
Save