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

Jump to bottom

[Devpack Testing] update artifacts #1153

Merged
merged 4 commits into from
Aug 26, 2024
Merged

[Devpack Testing] update artifacts #1153

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
616a684
update artifacts
Jim8y Aug 24, 2024
832ebba
add missing file
Jim8y Aug 24, 2024
40c5121
Merge branch 'master' into udpate-artifacts
Jim8y Aug 25, 2024
d5d7899
fix warning
Jim8y Aug 26, 2024
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
0 ...CompilationEngine/CompilationException.cs → ...CSharp/Diagnostic/CompilationException.cs
View file
Open in desktop
File renamed without changes.
29 changes: 19 additions & 10 deletions src/Neo.SmartContract.Testing/Extensions/ArtifactExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
sourceCode.WriteLine("");
sourceCode.WriteLine("namespace Neo.SmartContract.Testing;");
sourceCode.WriteLine("");
sourceCode.WriteLine($"public abstract class {name} : " + string.Join(", ", inheritance) + ", IContractInfo");
sourceCode.WriteLine($"public abstract class {name}({typeof(SmartContractInitialize).FullName} initialize) : " + FormatInheritance(inheritance, "initialize") + ", IContractInfo");
sourceCode.WriteLine("{");

// Write compiled data
Expand Down Expand Up @@ -172,14 +172,6 @@
sourceCode.WriteLine();
}

// Create constructor

sourceCode.WriteLine(" #region Constructor for internal use only");
sourceCode.WriteLine();
sourceCode.WriteLine($" protected {name}({typeof(SmartContractInitialize).FullName} initialize) : base(initialize) {{ }}");
sourceCode.WriteLine();
sourceCode.WriteLine(" #endregion");

sourceCode.WriteLine("}");

return sourceCode.ToString();
Expand Down Expand Up @@ -369,7 +361,7 @@

if (isLast && arg.Type == ContractParameterType.Any)
{
// it will be object X, we can add a default value
// it will be `object X`, we can add a default value

sourceCode.Write($"{TypeToSource(arg.Type)} {EscapeName(arg.Name)} = null");
}
Expand Down Expand Up @@ -436,5 +428,22 @@
_ => "object?",
};
}

private static string FormatInheritance(List<Type> inheritance, string initializeParam)
{
var formattedInheritance = new List<string>();
foreach (var type in inheritance)
{
if (type == typeof(SmartContract))
{
formattedInheritance.Add($"{type.FullName}({initializeParam})");
}
else
{
formattedInheritance.Add(type.FullName);

Check warning on line 443 in src/Neo.SmartContract.Testing/Extensions/ArtifactExtensions.cs

View workflow job for this annotation

GitHub Actions / Test 

Possible null reference argument for parameter 'item' in 'void List<string>.Add(string item)'.
shargon marked this conversation as resolved.
Show resolved Hide resolved
}
}
return string.Join(", ", formattedInheritance);
}
}
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract1 : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract1(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand Down Expand Up @@ -59,9 +59,4 @@ public abstract class Contract1 : Neo.SmartContract.Testing.SmartContract, ICont

#endregion

#region Constructor for internal use only

protected Contract1(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract2 : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract2(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand All @@ -29,9 +29,4 @@ public abstract class Contract2 : Neo.SmartContract.Testing.SmartContract, ICont

#endregion

#region Constructor for internal use only

protected Contract2(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_ABIAttributes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_ABIAttributes : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_ABIAttributes(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand All @@ -29,9 +29,4 @@ public abstract class Contract_ABIAttributes : Neo.SmartContract.Testing.SmartCo

#endregion

#region Constructor for internal use only

protected Contract_ABIAttributes(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_ABIAttributes2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_ABIAttributes2 : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_ABIAttributes2(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand All @@ -29,9 +29,4 @@ public abstract class Contract_ABIAttributes2 : Neo.SmartContract.Testing.SmartC

#endregion

#region Constructor for internal use only

protected Contract_ABIAttributes2(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_ABIAttributes3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_ABIAttributes3 : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_ABIAttributes3(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand All @@ -29,9 +29,4 @@ public abstract class Contract_ABIAttributes3 : Neo.SmartContract.Testing.SmartC

#endregion

#region Constructor for internal use only

protected Contract_ABIAttributes3(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_ABISafe.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_ABISafe : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_ABISafe(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand Down Expand Up @@ -44,9 +44,4 @@ public abstract class Contract_ABISafe : Neo.SmartContract.Testing.SmartContract

#endregion

#region Constructor for internal use only

protected Contract_ABISafe(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_Abort.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_Abort : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_Abort(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand Down Expand Up @@ -59,9 +59,4 @@ public abstract class Contract_Abort : Neo.SmartContract.Testing.SmartContract,

#endregion

#region Constructor for internal use only

protected Contract_Abort(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_Array.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_Array : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_Array(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand Down Expand Up @@ -143,9 +143,4 @@ public abstract class Contract_Array : Neo.SmartContract.Testing.SmartContract,

#endregion

#region Constructor for internal use only

protected Contract_Array(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_Assert.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_Assert : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_Assert(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand Down Expand Up @@ -53,9 +53,4 @@ public abstract class Contract_Assert : Neo.SmartContract.Testing.SmartContract,

#endregion

#region Constructor for internal use only

protected Contract_Assert(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_AttributeChanged.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_AttributeChanged : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_AttributeChanged(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand All @@ -29,9 +29,4 @@ public abstract class Contract_AttributeChanged : Neo.SmartContract.Testing.Smar

#endregion

#region Constructor for internal use only

protected Contract_AttributeChanged(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_BigInteger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_BigInteger : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_BigInteger(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand Down Expand Up @@ -179,9 +179,4 @@ public abstract class Contract_BigInteger : Neo.SmartContract.Testing.SmartContr

#endregion

#region Constructor for internal use only

protected Contract_BigInteger(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_Boolean.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_Boolean : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_Boolean(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand All @@ -29,9 +29,4 @@ public abstract class Contract_Boolean : Neo.SmartContract.Testing.SmartContract

#endregion

#region Constructor for internal use only

protected Contract_Boolean(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_ByteArrayAssignment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_ByteArrayAssignment : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_ByteArrayAssignment(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand Down Expand Up @@ -53,9 +53,4 @@ public abstract class Contract_ByteArrayAssignment : Neo.SmartContract.Testing.S

#endregion

#region Constructor for internal use only

protected Contract_ByteArrayAssignment(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_Char.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_Char : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_Char(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand Down Expand Up @@ -119,9 +119,4 @@ public abstract class Contract_Char : Neo.SmartContract.Testing.SmartContract, I

#endregion

#region Constructor for internal use only

protected Contract_Char(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_CheckedUnchecked.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_CheckedUnchecked : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_CheckedUnchecked(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand Down Expand Up @@ -47,9 +47,4 @@ public abstract class Contract_CheckedUnchecked : Neo.SmartContract.Testing.Smar

#endregion

#region Constructor for internal use only

protected Contract_CheckedUnchecked(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_ComplexAssign.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_ComplexAssign : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_ComplexAssign(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand Down Expand Up @@ -83,9 +83,4 @@ public abstract class Contract_ComplexAssign : Neo.SmartContract.Testing.SmartCo

#endregion

#region Constructor for internal use only

protected Contract_ComplexAssign(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_Concat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_Concat : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_Concat(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand Down Expand Up @@ -47,9 +47,4 @@ public abstract class Contract_Concat : Neo.SmartContract.Testing.SmartContract,

#endregion

#region Constructor for internal use only

protected Contract_Concat(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
7 changes: 1 addition & 6 deletions tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_ConcatByteStringAddAssign.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Neo.SmartContract.Testing;

public abstract class Contract_ConcatByteStringAddAssign : Neo.SmartContract.Testing.SmartContract, IContractInfo
public abstract class Contract_ConcatByteStringAddAssign(Neo.SmartContract.Testing.SmartContractInitialize initialize) : Neo.SmartContract.Testing.SmartContract(initialize), IContractInfo
{
#region Compiled data

Expand All @@ -29,9 +29,4 @@ public abstract class Contract_ConcatByteStringAddAssign : Neo.SmartContract.Tes

#endregion

#region Constructor for internal use only

protected Contract_ConcatByteStringAddAssign(Neo.SmartContract.Testing.SmartContractInitialize initialize) : base(initialize) { }

#endregion
}
Loading
Loading