Merge pull request #1 from chenzhitong/master

Rename SGAS to CGAS
neo-ngd · Aug 31, 2018 · 26264f3 · 26264f3
2 parents 5298f43 + 72961ba
commit 26264f3
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/NeoContract.sln b/NeoContract.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2035
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SGAS", "NeoContract\SGAS.csproj", "{15DFB6B6-A57D-4A26-A5B7-EA1B2D102E20}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CGAS", "NeoContract\CGAS.csproj", "{15DFB6B6-A57D-4A26-A5B7-EA1B2D102E20}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tools", "Tools\Tools.csproj", "{A4F2D281-A2E9-4950-AA18-098BF614FD6C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "SGAS.UnitTests\UnitTests.csproj", "{5C287CB0-FC56-482A-8C91-DB83B60C9B70}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SGAS.UnitTests", "SGAS.UnitTests\SGAS.UnitTests.csproj", "{5C287CB0-FC56-482A-8C91-DB83B60C9B70}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tools", "Tools\Tools.csproj", "{A4F2D281-A2E9-4950-AA18-098BF614FD6C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,14 +19,14 @@ Global
 		{15DFB6B6-A57D-4A26-A5B7-EA1B2D102E20}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{15DFB6B6-A57D-4A26-A5B7-EA1B2D102E20}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15DFB6B6-A57D-4A26-A5B7-EA1B2D102E20}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4F2D281-A2E9-4950-AA18-098BF614FD6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4F2D281-A2E9-4950-AA18-098BF614FD6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4F2D281-A2E9-4950-AA18-098BF614FD6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4F2D281-A2E9-4950-AA18-098BF614FD6C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5C287CB0-FC56-482A-8C91-DB83B60C9B70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5C287CB0-FC56-482A-8C91-DB83B60C9B70}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5C287CB0-FC56-482A-8C91-DB83B60C9B70}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C287CB0-FC56-482A-8C91-DB83B60C9B70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4F2D281-A2E9-4950-AA18-098BF614FD6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4F2D281-A2E9-4950-AA18-098BF614FD6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4F2D281-A2E9-4950-AA18-098BF614FD6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4F2D281-A2E9-4950-AA18-098BF614FD6C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/NeoContract/SGAS.cs → NeoContract/CGAS.cs b/NeoContract/SGAS.cs → NeoContract/CGAS.cs
@@ -6,9 +6,9 @@
 using System.Numerics;
 using System;
 
-namespace SGAS
+namespace CGAS
 {
-    public class SGAS : SmartContract
+    public class CGAS : SmartContract
     {
         [DisplayName("transfer")]
         public static event deleTransfer Transferred;
@@ -263,7 +263,7 @@ private static void SetTxInfo(byte[] from, byte[] to, BigInteger value)
         }
 
         [DisplayName("symbol")]
-        public static string Symbol() => "SGAS";
+        public static string Symbol() => "CGAS";
 
         [DisplayName("supportedStandards")]
         public static object SupportedStandards() => "{\"NEP-5\", \"NEP-7\", \"NEP-10\"}";

diff --git a/NeoContract/SGAS.csproj → NeoContract/CGAS.csproj b/NeoContract/SGAS.csproj → NeoContract/CGAS.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{15DFB6B6-A57D-4A26-A5B7-EA1B2D102E20}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SGAS</RootNamespace>
-    <AssemblyName>SGAS</AssemblyName>
+    <RootNamespace>CGAS</RootNamespace>
+    <AssemblyName>CGAS</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -46,7 +46,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SGAS.cs" />
+    <Compile Include="CGAS.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TransferInfo.cs" />
   </ItemGroup>

diff --git a/NeoContract/TransferInfo.cs b/NeoContract/TransferInfo.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace SGAS
+namespace CGAS
 {
     public class TransferInfo
     {

diff --git a/SGAS.UnitTests/SGASTest.cs → SGAS.UnitTests/CGASTest.cs b/SGAS.UnitTests/SGASTest.cs → SGAS.UnitTests/CGASTest.cs
@@ -11,9 +11,9 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NeoContract.UnitTests
+namespace UnitTests
 {
-    public static class SGASTest
+    public static class CGASTest
     {
         static readonly UInt160 SgasAddress = Wallet.ToScriptHash("AJk6Ugmz2bJGhoye9EAnssvvLghf6YmptA");
         static readonly UInt160 ScriptHash = new UInt160("0x3cfb49c6eb5360440bdd226528ada99e8d419220".Remove(0, 2).HexToBytes().Reverse().ToArray());

diff --git a/SGAS.UnitTests/Program.cs b/SGAS.UnitTests/Program.cs
@@ -12,7 +12,7 @@
 using Neo.Wallets;
 using VMArray = Neo.VM.Types.Array;
 
-namespace NeoContract.UnitTests
+namespace UnitTests
 {
     class Program
     {
@@ -22,7 +22,7 @@ static void Main(string[] args)
             //Path of blockchain folder
             Blockchain.RegisterBlockchain(new LevelDBBlockchain("C:\\Users\\chenz\\Desktop\\PrivateNet\\neo-gui 2.7.6\\Chain_0001142D"));
 
-            SGASTest.MintTokens();
+            CGASTest.MintTokens();
             //SGASTest.Refund();
             //SGASTest.Verify();
 

diff --git a/SGAS.UnitTests/SGAS.UnitTests.csproj → SGAS.UnitTests/UnitTests.csproj b/SGAS.UnitTests/SGAS.UnitTests.csproj → SGAS.UnitTests/UnitTests.csproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{5C287CB0-FC56-482A-8C91-DB83B60C9B70}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>SGAS.UnitTests</RootNamespace>
-    <AssemblyName>SGAS.UnitTests</AssemblyName>
+    <RootNamespace>UnitTests</RootNamespace>
+    <AssemblyName>UnitTests</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -222,7 +222,7 @@
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SGASTest.cs" />
+    <Compile Include="CGASTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

diff --git a/readme.md b/readme.md
@@ -14,9 +14,9 @@ neo-gui 2.7.6
 | decimals                 | see nep-5                          | neo-gui                        | ✅           |
 | getRefundTarget          | get who want to refund this UTXO   | neo-gui                        | ✅           |
 | getTxInfo                | get tx info                        | neo-gui                        | ✅           |
-| mintTokens               | GAS → SGAS                         | c# code + neo-cli              | ✅           |
+| mintTokens               | GAS → CGAS                         | c# code + neo-cli              | ✅           |
 | name                     | see nep-5                          | neo-gui                        | ✅           |
-| refund                   | SGAS → GAS 1/2 step                | c# code + neo-cli              | ✅           |
+| refund                   | CGAS → GAS 1/2 step                | c# code + neo-cli              | ✅           |
 | symbol                   | see nep-5                          | neo-gui                        | ✅           |
 | totalSupply              | see nep-5                          | neo-gui                        | ✅           |
 | transfer                 | see nep-5                          | neo-gui or neo-cli             | ✅           |