TestEngine: Some fixes

src/Neo.Compiler.CSharp/CompilationEngine.cs

@@ -249,7 +249,7 @@ public Compilation GetCompilation(string csproj)
  if (!remove.Contains("*.cs"))
  {
  var obj = Path.Combine(folder, "obj");
- var binSc = Path.Combine(Path.Combine(folder, "bin"), "sc");
+ var binSc = Path.Combine(folder, "bin");
  foreach (var entry in Directory.EnumerateFiles(folder, "*.cs", SearchOption.AllDirectories)
  .Where(p => !p.StartsWith(obj) && !p.StartsWith(binSc))
  .Select(u => u))

src/Neo.Compiler.CSharp/CompilationOptions.cs

@@ -32,7 +32,7 @@ public enum OptimizationType : byte
  public OptimizationType Optimize { get; set; } = OptimizationType.Basic;
  public bool Checked { get; set; }
  public bool NoInline { get; set; }
- public byte AddressVersion { get; set; }
+ public byte AddressVersion { get; set; } = 0x35;
  public string? BaseName { get; set; }
 
  private CSharpParseOptions? parseOptions = null;

src/Neo.SmartContract.Testing/Coverage/CoveredCollection.cs

@@ -61,12 +61,12 @@ public CoveredCollection(params CoverageBase[] entries)
  /// <returns>Coverage dump</returns>
  public override string Dump(DumpFormat format = DumpFormat.Console)
  {
- switch (format)
+ return format switch
  {
- case DumpFormat.Console: return new ConsoleFormat(GetEntries()).Dump();
- case DumpFormat.Html: return new IntructionHtmlFormat(GetEntries()).Dump();
- default: throw new NotImplementedException();
- }
+ DumpFormat.Console => new ConsoleFormat(GetEntries()).Dump(),
+ DumpFormat.Html => new IntructionHtmlFormat(GetEntries()).Dump(),
+ _ => throw new NotImplementedException(),
+ };
  }
 
  /// <summary>

src/Neo.SmartContract.Testing/Coverage/CoveredContract.cs

@@ -292,12 +292,12 @@ public void Join(CoverageBase? coverage)
  /// <returns>Coverage dump</returns>
  public override string Dump(DumpFormat format = DumpFormat.Console)
  {
- switch (format)
+ return format switch
  {
- case DumpFormat.Console: return new ConsoleFormat(this).Dump();
- case DumpFormat.Html: return new IntructionHtmlFormat(this).Dump();
- default: throw new NotImplementedException();
- }
+ DumpFormat.Console => new ConsoleFormat(this).Dump(),
+ DumpFormat.Html => new IntructionHtmlFormat(this).Dump(),
+ _ => throw new NotImplementedException(),
+ };
  }
 
  /// <summary>

src/Neo.SmartContract.Testing/Coverage/CoveredMethod.cs

@@ -61,12 +61,12 @@ public CoveredMethod(CoveredContract contract, ContractMethodDescriptor method,
  /// <returns>Coverage dump</returns>
  public override string Dump(DumpFormat format = DumpFormat.Console)
  {
- switch (format)
+ return format switch
  {
- case DumpFormat.Console: return new ConsoleFormat(Contract, m => ReferenceEquals(m, this)).Dump();
- case DumpFormat.Html: return new IntructionHtmlFormat(Contract, m => ReferenceEquals(m, this)).Dump();
- default: throw new NotImplementedException();
- }
+ DumpFormat.Console => new ConsoleFormat(Contract, m => ReferenceEquals(m, this)).Dump(),
+ DumpFormat.Html => new IntructionHtmlFormat(Contract, m => ReferenceEquals(m, this)).Dump(),
+ _ => throw new NotImplementedException(),
+ };
  }
 
  public override string ToString() => Method.ToString();

src/Neo.SmartContract.Testing/Coverage/Formats/ConsoleFormat.cs

@@ -19,7 +19,7 @@ public partial class ConsoleFormat : CoverageFormatBase
  /// <param name="filter">Method Filter</param>
  public ConsoleFormat(CoveredContract contract, Func<CoveredMethod, bool>? filter = null)
  {
- Entries = new (CoveredContract, Func<CoveredMethod, bool>?)[] { (contract, filter) };
+ Entries = new[] { (contract, filter) };
  }
 
  /// <summary>
@@ -69,13 +69,13 @@ private void WriteReport(StreamWriter writer)
  max[2] = Math.Max(coverLines.Length, max[2]);
  }
 
- writer.WriteLine($"┌-{"─".PadLeft(max[0], '─')}-┬-{"─".PadLeft(max[1], '─')}-┬-{"─".PadLeft(max[1], '─')}-┐");
- writer.WriteLine($"│ {string.Format($"{{0,-{max[0]}}}", "Method", max[0])} │ {string.Format($"{{0,{max[1]}}}", "Line ", max[1])} │ {string.Format($"{{0,{max[2]}}}", "Branch", max[1])} │");
- writer.WriteLine($"├-{"─".PadLeft(max[0], '─')}-┼-{"─".PadLeft(max[1], '─')}-┼-{"─".PadLeft(max[1], '─')}-┤");
+ writer.WriteLine($"┌-{"─".PadLeft(max[0], '─')}-┬-{"─".PadLeft(max[1], '─')}-┬-{"─".PadLeft(max[2], '─')}-┐");
+ writer.WriteLine($"│ {string.Format($"{{0,-{max[0]}}}", "Method", max[0])} │ {string.Format($"{{0,{max[1]}}}", "Line ", max[1])} │ {string.Format($"{{0,{max[2]}}}", "Branch", max[2])} │");
+ writer.WriteLine($"├-{"─".PadLeft(max[0], '─')}-┼-{"─".PadLeft(max[1], '─')}-┼-{"─".PadLeft(max[2], '─')}-┤");
 
  foreach (var print in rows)
  {
- writer.WriteLine($"│ {string.Format($"{{0,-{max[0]}}}", print[0], max[0])} │ {string.Format($"{{0,{max[1]}}}", print[1], max[1])} │ {string.Format($"{{0,{max[1]}}}", print[2], max[2])} │");
+ writer.WriteLine($"│ {string.Format($"{{0,-{max[0]}}}", print[0], max[0])} │ {string.Format($"{{0,{max[1]}}}", print[1], max[1])} │ {string.Format($"{{0,{max[2]}}}", print[2], max[2])} │");
  }
 
  writer.WriteLine($"└-{"─".PadLeft(max[0], '─')}-┴-{"─".PadLeft(max[1], '─')}-┴-{"─".PadLeft(max[2], '─')}-┘");

src/Neo.SmartContract.Testing/Extensions/ArtifactExtensions.cs

@@ -1,7 +1,5 @@
 using Neo.IO;
-using Neo.Json;
 using Neo.SmartContract.Manifest;
-using Neo.SmartContract.Testing.Coverage;
 using Neo.SmartContract.Testing.TestingStandards;
 using System;
 using System.Collections.Generic;
@@ -58,6 +56,7 @@ public static string GetArtifactsSource(this ContractManifest manifest, string?
  if (manifest.IsVerificable()) inheritance.Add(typeof(IVerificable));
 
  sourceCode.WriteLine("using Neo.Cryptography.ECC;");
+ sourceCode.WriteLine("using System;");
  sourceCode.WriteLine("using System.Collections.Generic;");
  sourceCode.WriteLine("using System.ComponentModel;");
  sourceCode.WriteLine("using System.Numerics;");
@@ -180,6 +179,7 @@ public static string GetArtifactsSource(this ContractManifest manifest, string?
  private static (ContractMethodDescriptor[] methods, (ContractMethodDescriptor getter, ContractMethodDescriptor? setter)[] properties)
  ProcessAbiMethods(ContractMethodDescriptor[] methods)
  {
+ HashSet<string> propertyNames = new();
  List<ContractMethodDescriptor> methodList = new(methods);
  List<(ContractMethodDescriptor, ContractMethodDescriptor?)> properties = new();
 
@@ -199,6 +199,13 @@ private static (ContractMethodDescriptor[] methods, (ContractMethodDescriptor ge
  u.ReturnType == ContractParameterType.Void
  ) : null;
 
+ // Avoid property repetition
+
+ var propertyName = GetPropertyName(getter);
+ if (!propertyNames.Add(propertyName)) continue;
+
+ // Add property and remove method
+
  properties.Add((getter, setter));
  methodList.Remove(getter);
 
@@ -211,6 +218,11 @@ private static (ContractMethodDescriptor[] methods, (ContractMethodDescriptor ge
  return (methodList.ToArray(), properties.ToArray());
  }
 
+ private static string GetPropertyName(ContractMethodDescriptor getter)
+ {
+ return TongleLowercase(EscapeName(getter.Name.StartsWith("get") ? getter.Name[3..] : getter.Name));
+ }
+
  /// <summary>
  /// Create source code from event
  /// </summary>
@@ -296,7 +308,7 @@ private static string CreateSourceEventFromManifest(ContractEventDescriptor ev,
  /// <returns>Source</returns>
  private static string CreateSourcePropertyFromManifest(ContractMethodDescriptor getter, ContractMethodDescriptor? setter)
  {
- var propertyName = TongleLowercase(EscapeName(getter.Name.StartsWith("get") ? getter.Name[3..] : getter.Name));
+ var propertyName = GetPropertyName(getter);
  var getset = setter is not null ? $"{{ [DisplayName(\"{getter.Name}\")] get; [DisplayName(\"{setter.Name}\")] set; }}" : $"{{ [DisplayName(\"{getter.Name}\")] get; }}";
 
  var builder = new StringBuilder();

src/Neo.SmartContract.Testing/Extensions/TestExtensions.cs

@@ -1,4 +1,3 @@
-using Akka.Util;
 using Neo.Cryptography.ECC;
 using Neo.SmartContract.Testing.Attributes;
 using Neo.VM.Types;
@@ -50,6 +49,7 @@ public static class TestExtensions
 
  return type switch
  {
+ _ when type == stackItem.GetType() => stackItem,
  _ when type == typeof(object) => stackItem,
  _ when type == typeof(string) => Utility.StrictUTF8.GetString(stackItem.GetSpan()),
  _ when type == typeof(byte[]) => stackItem.GetSpan().ToArray(),

src/Neo.SmartContract.Testing/InvalidTypes/InvalidECPoint.cs

@@ -0,0 +1,22 @@
+using Neo.Cryptography.ECC;
+
+namespace Neo.SmartContract.Testing.InvalidTypes
+{
+ public class InvalidECPoint
+ {
+ /// <summary>
+ /// Null ECPoint
+ /// </summary>
+ public static readonly ECPoint? Null = null;
+
+ /// <summary>
+ /// This will be an invalid ECPoint (ByteString)
+ /// </summary>
+ public static readonly ECPoint InvalidLength = new();
+
+ /// <summary>
+ /// This will be an invalid ECPoint (Integer)
+ /// </summary>
+ public static readonly ECPoint InvalidType = new();
+ }
+}

src/Neo.SmartContract.Testing/README.md

@@ -84,6 +84,7 @@ And for read and write, we have:
 - **Gas**: Sets the gas execution limit for contract calls. Sets the `NetworkFee` of the `Transaction` object.
 - **EnableCoverageCapture**: Enables or disables the coverage capture. 
 - **Trigger**: The trigger of the execution.
+- **CallFlags**: Define the `CallFlags` for the mocked function, `All` by default.
 - **OnGetEntryScriptHash**: This feature makes it easy to change the EntryScriptHash.
 - **OnGetCallingScriptHash**: This feature makes it easy to change the CallingScriptHash.
 

src/Neo.SmartContract.Testing/SmartContract.cs

@@ -53,8 +53,30 @@ internal StackItem Invoke(string methodName, params object[] args)
  {
  // Compose script
 
+ TestingSyscall? dynArgument = null;
  using ScriptBuilder script = new();
 
+ ConvertArgs(script, args, ref dynArgument);
+
+ script.EmitPush(Engine.CallFlags);
+ script.EmitPush(methodName);
+ script.EmitPush(Hash);
+ script.EmitSysCall(ApplicationEngine.System_Contract_Call);
+
+ // Execute
+
+ return Engine.Execute(script.ToArray(), 0, dynArgument is null ? null : engine => ConfigureEngine(engine, dynArgument));
+ }
+
+ private void ConfigureEngine(ApplicationEngine engine, TestingSyscall testingSyscall)
+ {
+ if (engine is not TestingApplicationEngine testEngine) throw new InvalidOperationException();
+
+ testEngine.TestingSyscall = testingSyscall;
+ }
+
+ private void ConvertArgs(ScriptBuilder script, object[] args, ref TestingSyscall? testingSyscall)
+ {
  if (args is null || args.Length == 0)
  script.Emit(OpCode.NEWARRAY0);
  else
@@ -63,31 +85,52 @@ internal StackItem Invoke(string methodName, params object[] args)
  {
  var arg = args[i];
 
+ if (arg is object[] arg2)
+ {
+ ConvertArgs(script, arg2, ref testingSyscall);
+ continue;
+ }
+ else if (arg is IEnumerable<object> argEnumerable)
+ {
+ ConvertArgs(script, argEnumerable.ToArray(), ref testingSyscall);
+ continue;
+ }
+
  if (ReferenceEquals(arg, InvalidTypes.InvalidUInt160.InvalidLength) ||
- ReferenceEquals(arg, InvalidTypes.InvalidUInt256.InvalidLength))
+ ReferenceEquals(arg, InvalidTypes.InvalidUInt256.InvalidLength) ||
+ ReferenceEquals(arg, InvalidTypes.InvalidECPoint.InvalidLength))
  {
  arg = System.Array.Empty<byte>();
  }
  else if (ReferenceEquals(arg, InvalidTypes.InvalidUInt160.InvalidType) ||
- ReferenceEquals(arg, InvalidTypes.InvalidUInt256.InvalidType))
+ ReferenceEquals(arg, InvalidTypes.InvalidUInt256.InvalidType) ||
+ ReferenceEquals(arg, InvalidTypes.InvalidECPoint.InvalidType))
  {
  arg = BigInteger.Zero;
  }
+ else if (arg is InteropInterface interop)
+ {
+ // We can't send the interopInterface by an script
+ // We create a syscall in order to detect it and push the item
+
+ testingSyscall ??= new TestingSyscall();
+ script.EmitSysCall(TestingSyscall.Hash, testingSyscall.Add((e) => e.Push(interop)));
+ continue;
+ }
+ else if (arg is Action<ApplicationEngine> onItem)
+ {
+ // We create a syscall in order to detect it and push the item
+
+ testingSyscall ??= new TestingSyscall();
+ script.EmitSysCall(TestingSyscall.Hash, testingSyscall.Add((e) => onItem(e)));
+ continue;
+ }
 
  script.EmitPush(arg);
  }
  script.EmitPush(args.Length);
  script.Emit(OpCode.PACK);
  }
-
- script.EmitPush(CallFlags.All);
- script.EmitPush(methodName);
- script.EmitPush(Hash);
- script.EmitSysCall(ApplicationEngine.System_Contract_Call);
-
- // Execute
-
- return Engine.Execute(script.ToArray());
  }
 
  /// <summary>

src/Neo.SmartContract.Testing/Storage/SmartContractStorage.cs

@@ -10,6 +10,11 @@ public class SmartContractStorage
  private readonly SmartContract _smartContract;
  private int? _contractId;
 
+ /// <summary>
+ /// Storage Id
+ /// </summary>
+ public int Id => GetContractId();
+
  /// <summary>
  /// Constructor
  /// </summary>