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

Update dev-pack with last neo changes #146

Merged
merged 20 commits into from
Dec 9, 2019
Merged

Update dev-pack with last neo changes #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
855709b
Update references
shargon Dec 5, 2019
3646d7f
Update
shargon Dec 5, 2019
eb53774
Clean file
shargon Dec 5, 2019
29003b9
Update tests/Neo.SmartContract.Framework.UnitTests/Neo.SmartContract.…
shargon Dec 5, 2019
8fcc2d8
Update tests/Neo.Compiler.MSIL.UnitTests/Neo.Compiler.MSIL.UnitTests.…
shargon Dec 5, 2019
7b91507
Update src/Neo.Compiler.MSIL/Neo.Compiler.MSIL.csproj
shargon Dec 5, 2019
0c64481
Add Reference Counter
shargon Dec 5, 2019
bf647c2
Clean file
shargon Dec 5, 2019
361f2fd
Clean files
shargon Dec 5, 2019
2655430
Fix travis in order to know the error
shargon Dec 5, 2019
cc4f58d
Update packages
shargon Dec 5, 2019
c615da7
Merge branch 'master' into update-neo
shargon Dec 5, 2019
e2ed02a
Update .travis.yml
shargon Dec 5, 2019
d631960
End changes
shargon Dec 6, 2019
f3a303e
dotnet-format
shargon Dec 6, 2019
a8f875f
Fix shift UT
shargon Dec 6, 2019
27a0cc7
Update version
erikzhang Dec 9, 2019
0b9efb5
Update framework
erikzhang Dec 9, 2019
3368ebd
Fix UT
erikzhang Dec 9, 2019
60de122
Merge branch 'master' into update-neo
erikzhang Dec 9, 2019
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ os:

dist: bionic
mono: none
dotnet: 2.2.402
dotnet: 3.1.100

install:
- dotnet tool install -g dotnet-format
Expand Down
5 changes: 3 additions & 2 deletions src/Neo.Compiler.MSIL/Compiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ internal static Assembly Create(Compilation comp)

if (!result.Success)
{
throw new ArgumentException();
throw new ArgumentException(string.Join(Environment.NewLine, result.Diagnostics.Select(u => u.ToString())));
}

streamDll.Position = 0;
Expand Down Expand Up @@ -175,11 +175,12 @@ private static MetadataReference[] CreateReferences(params string[] references)
var refs = new List<MetadataReference>(new MetadataReference[]
{
MetadataReference.CreateFromFile(Path.Combine(coreDir, "mscorlib.dll")),
MetadataReference.CreateFromFile(Path.Combine(coreDir, "netstandard.dll")),
MetadataReference.CreateFromFile(Path.Combine(coreDir, "System.Runtime.dll")),
MetadataReference.CreateFromFile(Path.Combine(coreDir, "System.Runtime.Numerics.dll")),
MetadataReference.CreateFromFile(typeof(System.ComponentModel.DisplayNameAttribute).Assembly.Location),
MetadataReference.CreateFromFile(typeof(object).Assembly.Location),
MetadataReference.CreateFromFile(typeof(Neo.SmartContract.Framework.SmartContract).Assembly.Location),
MetadataReference.CreateFromFile(typeof(SmartContract.Framework.SmartContract).Assembly.Location),
});
refs.AddRange(references.Select(u => MetadataReference.CreateFromFile(u)));
return refs.ToArray();
Expand Down
10 changes: 5 additions & 5 deletions src/Neo.Compiler.MSIL/Neo.Compiler.MSIL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<Copyright>2015-2019 The Neo Project</Copyright>
<AssemblyTitle>Neo.Compiler.MSIL</AssemblyTitle>
<Version>2.4.1</Version>
<Version>3.0.0-preview1</Version>
<Authors>The Neo Project</Authors>
<TargetFrameworks>netcoreapp2.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;netstandard2.1</TargetFrameworks>
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are we supporting netstandard2.1 here. This is a CLI tool, it should just have the single 3.1 target framework

Copy link
Member

Choose a reason for hiding this comment

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

So it means that it is a library too.

Copy link
Contributor

Choose a reason for hiding this comment

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

why do we need it to be a library too?

Copy link
Member

Choose a reason for hiding this comment

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

https:/neo-project/neo-compiler/pull/147#issue-252914432

This was the PR that turned neon into a library at the time. Maybe some developers have such a need. I do not know.

<OutputType>Exe</OutputType>
<AssemblyName>neon</AssemblyName>
<PackageId>Neo.Compiler.MSIL</PackageId>
Expand All @@ -22,10 +22,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.3.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.4.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.1" />
<PackageReference Include="Neo" Version="3.0.0-CI00212" />
<PackageReference Include="Neo" Version="3.0.0-CI00822" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 3 additions & 10 deletions src/Neo.SmartContract.Framework/Neo.SmartContract.Framework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Copyright>2016-2017 The Neo Project</Copyright>
<Copyright>2016-2019 The Neo Project</Copyright>
<AssemblyTitle>Neo.SmartContract.Framework</AssemblyTitle>
<Version>2.9.3</Version>
<Version>3.0.0-preview1</Version>
<Authors>The Neo Project</Authors>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Neo.SmartContract.Framework</AssemblyName>
<PackageId>Neo.SmartContract.Framework</PackageId>
<PackageTags>NEO;AntShares;Blockchain;Smart Contract;VM</PackageTags>
<PackageProjectUrl>https:/neo-project/neo-devpack-dotnet</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https:/neo-project/neo-devpack-dotnet.git</RepositoryUrl>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
<Company>The Neo Project</Company>
<Description>Neo.SmartContract.Framework</Description>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.6|AnyCPU'">
<DefineConstants>RELEASE;NETSTANDARD1_6</DefineConstants>
<DebugType>none</DebugType>
<DebugSymbols>False</DebugSymbols>
</PropertyGroup>

</Project>
4 changes: 2 additions & 2 deletions templates/Template.CSharp/ProjectTemplate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Neo.SmartContract.Framework" Version="2.9.3" />
<PackageReference Include="Neo.SmartContract.Framework" Version="3.0.0-preview1" />
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
Expand Down
4 changes: 2 additions & 2 deletions templates/Template.VB/ProjectTemplate.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<RootNamespace>$safeprojectname$</RootNamespace>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Neo.SmartContract.Framework" Version="2.9.3" />
<PackageReference Include="Neo.SmartContract.Framework" Version="3.0.0-preview1" />
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
Expand Down
2 changes: 1 addition & 1 deletion tests/Neo.Compiler.MSIL.UnitTests/Neo.Compiler.MSIL.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
<RootNamespace>Neo.Compiler.MSIL</RootNamespace>
</PropertyGroup>
Expand Down
12 changes: 4 additions & 8 deletions tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_shift.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Neo.Compiler.MSIL.TestClasses
{
class Contract_shift : SmartContract.Framework.SmartContract
Expand All @@ -13,10 +9,10 @@ public static object Main(string method, object[] args)
var v2 = v << -1;
var v3 = v >> 1;
var v4 = v >> -1;
Neo.SmartContract.Framework.Services.Neo.Runtime.Log((string)(object)v1);
Neo.SmartContract.Framework.Services.Neo.Runtime.Log((string)(object)v2);
Neo.SmartContract.Framework.Services.Neo.Runtime.Log((string)(object)v3);
Neo.SmartContract.Framework.Services.Neo.Runtime.Log((string)(object)v4);
SmartContract.Framework.Services.Neo.Runtime.Notify(v1);
SmartContract.Framework.Services.Neo.Runtime.Notify(v2);
SmartContract.Framework.Services.Neo.Runtime.Notify(v3);
SmartContract.Framework.Services.Neo.Runtime.Notify(v4);
return false;
}
}
Expand Down
9 changes: 4 additions & 5 deletions tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_shift_bigint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Neo.Compiler.MSIL.TestClasses
{
class Contract_shift_bigint : SmartContract.Framework.SmartContract
Expand All @@ -13,7 +9,10 @@ public static object Main(string method, object[] args)
var v2 = v << -1;
var v3 = v >> 1;
var v4 = v >> -1;
Neo.SmartContract.Framework.Services.Neo.Runtime.Notify(v1, v2, v3, v4);
SmartContract.Framework.Services.Neo.Runtime.Notify(v1);
SmartContract.Framework.Services.Neo.Runtime.Notify(v2);
SmartContract.Framework.Services.Neo.Runtime.Notify(v3);
SmartContract.Framework.Services.Neo.Runtime.Notify(v4);
return false;
}
}
Expand Down
3 changes: 2 additions & 1 deletion tests/Neo.Compiler.MSIL.UnitTests/UnitTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Neo.Compiler.MSIL.Utils;
using Neo.VM;
using Neo.VM.Types;
using System;

namespace Neo.Compiler.MSIL
Expand Down Expand Up @@ -62,6 +62,7 @@ public void Test_ByteArray_New()
var bequal = wantresult.Equals(result);
Assert.IsTrue(bequal);
}

[TestMethod]
public void Test_ByteArrayPick()
{
Expand Down
3 changes: 1 addition & 2 deletions tests/Neo.Compiler.MSIL.UnitTests/UnitTest_Appcall.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Neo.Compiler.MSIL.Utils;
using Neo.VM;
using Neo.VM.Types;

namespace Neo.Compiler.MSIL
{
Expand All @@ -27,7 +27,6 @@ public void Test_Appcall()

var bequal = wantresult.Equals(result);
Assert.IsTrue(bequal);

}
}
}
4 changes: 2 additions & 2 deletions tests/Neo.Compiler.MSIL.UnitTests/UnitTest_AutoEntrypoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Neo.Compiler.MSIL.Utils;
using Neo.VM;
using Neo.VM.Types;

namespace Neo.Compiler.MSIL
{
Expand All @@ -27,8 +28,7 @@ public void Test_AutoEntry_private()
var testengine = new TestEngine();
testengine.AddEntryScript("./TestClasses/Contract_autoentrypoint.cs");
testengine.ScriptEntry.DumpNEF();
StackItem[] _params = new StackItem[] { "privateMethod", new StackItem[0] };
var result = testengine.ExecuteTestCase(_params);//new test method02
var result = testengine.ExecuteTestCaseStandard("privateMethod");//new test method02

bool hadFault = (testengine.State & VMState.FAULT) > 0;
Assert.AreEqual(0, result.Count);//because no methodname had found, it do not return anything.
Expand Down
13 changes: 6 additions & 7 deletions tests/Neo.Compiler.MSIL.UnitTests/UnitTest_NULL.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Neo.Compiler.MSIL.Utils;
using Neo.VM;
using Neo.VM.Types;

namespace Neo.Compiler.MSIL
Expand All @@ -27,7 +26,7 @@ public void IsNull()
var item = result.Pop();

Assert.IsInstanceOfType(item, typeof(Boolean));
Assert.IsTrue(item.GetBoolean());
Assert.IsTrue(item.ToBoolean());

// False

Expand All @@ -36,7 +35,7 @@ public void IsNull()
item = result.Pop();

Assert.IsInstanceOfType(item, typeof(Boolean));
Assert.IsFalse(item.GetBoolean());
Assert.IsFalse(item.ToBoolean());
}

[TestMethod]
Expand All @@ -49,7 +48,7 @@ public void EqualNull()
var item = result.Pop();

Assert.IsInstanceOfType(item, typeof(Boolean));
Assert.IsTrue(item.GetBoolean());
Assert.IsTrue(item.ToBoolean());

// False

Expand All @@ -58,7 +57,7 @@ public void EqualNull()
item = result.Pop();

Assert.IsInstanceOfType(item, typeof(Boolean));
Assert.IsFalse(item.GetBoolean());
Assert.IsFalse(item.ToBoolean());

// True

Expand All @@ -67,7 +66,7 @@ public void EqualNull()
item = result.Pop();

Assert.IsInstanceOfType(item, typeof(Boolean));
Assert.IsTrue(item.GetBoolean());
Assert.IsTrue(item.ToBoolean());

// False

Expand All @@ -76,7 +75,7 @@ public void EqualNull()
item = result.Pop();

Assert.IsInstanceOfType(item, typeof(Boolean));
Assert.IsFalse(item.GetBoolean());
Assert.IsFalse(item.ToBoolean());
}
}
}
23 changes: 20 additions & 3 deletions tests/Neo.Compiler.MSIL.UnitTests/UnitTest_Shift.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Neo.Compiler.MSIL.Utils;
using Neo.VM;
using Neo.SmartContract;
using System;
using System.Collections.Generic;
using System.Numerics;

namespace Neo.Compiler.MSIL
{
Expand All @@ -10,19 +13,33 @@ public class UnitTest_Shift
[TestMethod]
public void Test_Shift()
{
var list = new List<BigInteger>();
var method = new EventHandler<NotifyEventArgs>((sender, e) => list.Add(((VM.Types.Integer)((VM.Types.Array)e.State)[0]).ToBigInteger()));
ApplicationEngine.Notify += method;

var testengine = new TestEngine();
testengine.AddEntryScript("./TestClasses/Contract_shift.cs");
testengine.ScriptEntry.DumpNEF();
var result = testengine.ExecuteTestCaseStandard("testfunc");
ApplicationEngine.Notify -= method;

CollectionAssert.AreEqual(new BigInteger[] { 16, 17179869184, 4, 0 }, list);
Copy link
Member Author

Choose a reason for hiding this comment

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

@lightszero please take a look this, with int, we have a different result than BigInteger. it's this expected?

Copy link
Member

Choose a reason for hiding this comment

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

There is only BigInteger in NeoVM, so currently it can only be handled like this.

Copy link
Member Author

Choose a reason for hiding this comment

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

But integer result should be the same, because it should be converted to BigInteger. It's strange

Copy link
Member

Choose a reason for hiding this comment

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

You are right. We should treat the behavior of negative shifts as undefined and disallow it.

}

[TestMethod]
public void Test_Shift_BigInteger()
{
var list = new List<BigInteger>();
var method = new EventHandler<NotifyEventArgs>((sender, e) => list.Add(((VM.Types.Integer)((VM.Types.Array)e.State)[0]).ToBigInteger()));
ApplicationEngine.Notify += method;

var testengine = new TestEngine();
testengine.AddEntryScript("./TestClasses/Contract_shift_bigint.cs");
testengine.ScriptEntry.DumpNEF();
StackItem[] _params = new StackItem[] { "testfunc", new StackItem[0] };
var result = testengine.ExecuteTestCase(_params);
var result = testengine.ExecuteTestCaseStandard("testfunc");
ApplicationEngine.Notify -= method;

CollectionAssert.AreEqual(new BigInteger[] { 16, 4, 4, 16 }, list);
}
}
}
2 changes: 1 addition & 1 deletion tests/Neo.Compiler.MSIL.UnitTests/UnitTest_StaticVar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Neo.Compiler.MSIL.Utils;
using Neo.VM;
using Neo.VM.Types;

namespace Neo.Compiler.MSIL
{
Expand Down
6 changes: 3 additions & 3 deletions tests/Neo.Compiler.MSIL.UnitTests/UnitTest_Switch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class UnitTest_Switch
[TestMethod]
public void Test_SwitchLong()
{
RandomAccessStack<StackItem> result;
EvaluationStack result;
TestEngine testengine = new TestEngine();
testengine.AddEntryScript("./TestClasses/Contract_SwitchLong.cs");

Expand All @@ -36,7 +36,7 @@ public void Test_SwitchLong()
[TestMethod]
public void Test_SwitchLong_Release()
{
RandomAccessStack<StackItem> result;
EvaluationStack result;
TestEngine testengine = new TestEngine();
testengine.AddEntryScript("./TestClasses/Contract_SwitchLong.cs", true);

Expand All @@ -59,7 +59,7 @@ public void Test_SwitchLong_Release()
[TestMethod]
public void Test_Switch6()
{
RandomAccessStack<StackItem> result;
EvaluationStack result;
TestEngine testengine = new TestEngine();
testengine.AddEntryScript("./TestClasses/Contract_Switch6.cs");

Expand Down
6 changes: 3 additions & 3 deletions tests/Neo.Compiler.MSIL.UnitTests/Utils/TestDataCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public TestDataCache(TKey key, TValue value)
{
dic.Add(key, value);
}
public override void DeleteInternal(TKey key)
protected override void DeleteInternal(TKey key)
{
dic.Remove(key);
}
Expand All @@ -28,9 +28,9 @@ protected override void AddInternal(TKey key, TValue value)
dic.Add(key, value);
}

protected override IEnumerable<KeyValuePair<TKey, TValue>> FindInternal(byte[] key_prefix)
protected override IEnumerable<(TKey Key, TValue Value)> FindInternal(byte[] key_prefix)
{
return dic.ToList();
return dic.Select(u => (u.Key, u.Value));
}

protected override TValue GetInternal(TKey key)
Expand Down
Loading