Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate manifest after compilation #658

Merged
merged 16 commits into from
Nov 12, 2021
Merged

Validate manifest after compilation #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b8126a5
Validate manifest after compilation
shargon Jun 25, 2021
d239f34
Merge branch 'master' into validate-manifest
shargon Jul 19, 2021
43d5d56
update nuget
shargon Jul 19, 2021
676c821
Merge branch 'master' into validate-manifest
shargon Oct 19, 2021
0d68b47
Change UT
shargon Oct 19, 2021
e43f36e
Merge branch 'master' into validate-manifest
shargon Oct 19, 2021
6826fc3
Fix
shargon Nov 3, 2021
a8951b9
Merge branch 'master' into validate-manifest
shargon Nov 10, 2021
ac858ee
Improve message
shargon Nov 10, 2021
3e4c99e
Reduce checks
shargon Nov 11, 2021
975ed3a
Remove manifest checks too
erikzhang Nov 11, 2021
9b09376
Remove const
shargon Nov 11, 2021
140e306
Rename
erikzhang Nov 11, 2021
8b93241
Check method name conflict
erikzhang Nov 11, 2021
803a7d7
Improve exception message
erikzhang Nov 11, 2021
e05babc
Fix method key
shargon Nov 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/Neo.Compiler.CSharp/CompilationContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,10 @@ private void ProcessEvent(IEventSymbol symbol)
INamedTypeSymbol type = (INamedTypeSymbol)symbol.Type;
if (!type.DelegateInvokeMethod!.ReturnsVoid)
throw new CompilationException(symbol, DiagnosticId.EventReturns, $"Event return value is not supported.");
eventsExported.Add(new AbiEvent(symbol));
AbiEvent ev = new(symbol);
if (eventsExported.Any(u => u.Name == ev.Name))
throw new CompilationException(symbol, DiagnosticId.EventNameConflict, $"Duplicate event name: {ev.Name}.");
eventsExported.Add(ev);
}

private void ProcessMethod(SemanticModel model, IMethodSymbol symbol, bool export)
Expand All @@ -453,7 +456,13 @@ private void ProcessMethod(SemanticModel model, IMethodSymbol symbol, bool expor
if (symbol.MethodKind != MethodKind.Ordinary && symbol.MethodKind != MethodKind.PropertyGet && symbol.MethodKind != MethodKind.PropertySet)
return;
}
if (export) methodsExported.Add(new AbiMethod(symbol));
if (export)
{
AbiMethod method = new(symbol);
if (methodsExported.Any(u => u.Name == method.Name && u.Parameters.Length == method.Parameters.Length))
throw new CompilationException(symbol, DiagnosticId.MethodNameConflict, $"Duplicate method key: {method.Name},{method.Parameters.Length}.");
Comment on lines +462 to +463
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@erikzhang please take a look again, the method key is with arguments
https://github.com/neo-project/neo/blob/02cae386af6da48d46d02a373e2cf0116e3a8622/src/neo/SmartContract/Manifest/ContractAbi.cs#L77

methodsExported.Add(method);
}
MethodConvert convert = ConvertMethod(model, symbol);
if (export && !symbol.IsStatic)
{
Expand Down
2 changes: 2 additions & 0 deletions src/Neo.Compiler.CSharp/DiagnosticId.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,7 @@ static class DiagnosticId
public const string FormatClause = "NC2013";
public const string InvalidInitialValueType = "NC3001";
public const string InvalidMethodName = "NC3002";
public const string MethodNameConflict = "NC3003";
public const string EventNameConflict = "NC3004";
}
}
15 changes: 15 additions & 0 deletions tests/Neo.Compiler.CSharp.UnitTests/TestClasses/Contract_DuplicateNames.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using System;
using System.Numerics;
using System.ComponentModel;

namespace Neo.Compiler.CSharp.UnitTests.TestClasses
{
public class Contract_DuplicateNames : SmartContract.Framework.SmartContract
{
[DisplayName("Notify")]
public static event Action<BigInteger> Notice;

[DisplayName("Notify")]
public static event Action<BigInteger> AA;
}
}
9 changes: 9 additions & 0 deletions tests/Neo.Compiler.CSharp.UnitTests/UnitTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ public void Test_InvalidNameMethodContracts()
Assert.IsTrue(context.Diagnostics.Any(u => u.Id == DiagnosticId.InvalidMethodName));
}

[TestMethod]
public void Test_DuplicateDisplayNames()
{
var testengine = new TestEngine();
var context = testengine.AddEntryScript("./TestClasses/Contract_DuplicateNames.cs");
Assert.IsFalse(context.Success);
Assert.IsTrue(context.Diagnostics.Any(u => u.Id == DiagnosticId.EventNameConflict));
}

[TestMethod]
public void Test_PrivateMethod()
{
Expand Down