mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-01-19 05:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure RateRules do not remove comments

Browse Source
This commit is contained in:
nicolas.dorier 2018-05-03 04:33:21 +09:00
parent 34d0d3e011
commit f460837f96
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BTCPayServer.Tests/RateRulesTest.cs
View File

@ -14,17 +14,21 @@ namespace BTCPayServer.Tests
{
// Check happy path
StringBuilder builder = new StringBuilder();
builder.AppendLine("// Some cool comments");
builder.AppendLine("DOGE_X = DOGE_BTC * BTC_X * 1.1");
builder.AppendLine("DOGE_BTC = Bittrex(DOGE_BTC)");
builder.AppendLine("// Some other cool comments");
builder.AppendLine("BTC_usd = GDax(BTC_USD)");
builder.AppendLine("BTC_X = Coinbase(BTC_X)");
builder.AppendLine("BTC_X = Coinbase(BTC_X);");
builder.AppendLine("X_X = CoinAverage(X_X) * 1.02");
Assert.False(RateRules.TryParse("DPW*&W&#hdi&#&3JJD", out var rules));
Assert.True(RateRules.TryParse(builder.ToString(), out rules));
Assert.Equal(
"// Some cool comments\n" +
"DOGE_X = DOGE_BTC * BTC_X * 1.1;\n" +
"DOGE_BTC = bittrex(DOGE_BTC);\n" +
"// Some other cool comments\n" +
"BTC_USD = gdax(BTC_USD);\n" +
"BTC_X = coinbase(BTC_X);\n" +
"X_X = coinaverage(X_X) * 1.02;",

30
BTCPayServer/Rating/RateRules.cs
View File

@ -55,7 +55,8 @@ namespace BTCPayServer.Rating
}
if (CurrencyPair.TryParse(node.Identifier.ValueText, out var currencyPair))
{
return SyntaxFactory.IdentifierName(currencyPair.ToString());
return SyntaxFactory.IdentifierName(currencyPair.ToString())
.WithTriviaFrom(node);
}
else
{
@ -66,25 +67,30 @@ namespace BTCPayServer.Rating
}
class RuleList : CSharpSyntaxWalker
{
public Dictionary<CurrencyPair, ExpressionSyntax> ExpressionsByPair = new Dictionary<CurrencyPair, ExpressionSyntax>();
public Dictionary<CurrencyPair, (ExpressionSyntax Expression, SyntaxNode Trivia)> ExpressionsByPair = new Dictionary<CurrencyPair, (ExpressionSyntax Expression, SyntaxNode Trivia)>();
public override void VisitAssignmentExpression(AssignmentExpressionSyntax node)
{
if (node.Left is IdentifierNameSyntax id)
if (node.Kind() == SyntaxKind.SimpleAssignmentExpression
&& node.Left is IdentifierNameSyntax id
&& node.Right is ExpressionSyntax expression)
{
if (CurrencyPair.TryParse(id.Identifier.ValueText, out var currencyPair))
{
ExpressionsByPair.TryAdd(currencyPair, node.Right);
expression = expression.WithTriviaFrom(expression);
ExpressionsByPair.Add(currencyPair, (expression, id));
}
}
base.VisitAssignmentExpression(node);
}
public SyntaxNode GetSyntaxNode()
{
return SyntaxFactory.Block(
ExpressionsByPair.Select(e =>
SyntaxFactory.ExpressionStatement(
SyntaxFactory.AssignmentExpression(SyntaxKind.SimpleAssignmentExpression,
SyntaxFactory.IdentifierName(e.Key.ToString()),
e.Value)
SyntaxFactory.IdentifierName(e.Key.ToString()).WithTriviaFrom(e.Value.Trivia),
e.Value.Expression)
))
);
}
@ -98,8 +104,8 @@ namespace BTCPayServer.Rating
RateRules(SyntaxNode root)
{
ruleList = new RuleList();
// Remove every irrelevant statements
ruleList.Visit(root);
// Remove every irrelevant statements
this.root = ruleList.GetSyntaxNode();
}
public static bool TryParse(string str, out RateRules rules)
@ -139,9 +145,9 @@ namespace BTCPayServer.Rating
(Pair: new CurrencyPair("X", "X"), Priority: 2)
})
{
if (ruleList.ExpressionsByPair.TryGetValue(pair.Pair, out ExpressionSyntax expression))
if (ruleList.ExpressionsByPair.TryGetValue(pair.Pair, out var expression))
{
candidates.Add((pair.Pair, pair.Priority, expression));
candidates.Add((pair.Pair, pair.Priority, expression.Expression));
}
}
if (candidates.Count == 0)
@ -161,9 +167,9 @@ namespace BTCPayServer.Rating
public override string ToString()
{
return this.root.NormalizeWhitespace("", "\n")
.ToFullString()
.Replace("{\n", string.Empty, StringComparison.OrdinalIgnoreCase)
return root.NormalizeWhitespace("", "\n")
.ToFullString()
.Replace("{\n", string.Empty, StringComparison.OrdinalIgnoreCase)
.Replace("\n}", string.Empty, StringComparison.OrdinalIgnoreCase);
}
}