diff --git a/src/Neo.Network.RpcClient/API_REFERENCE.md b/docs/RpcClient/API_REFERENCE.md similarity index 100% rename from src/Neo.Network.RpcClient/API_REFERENCE.md rename to docs/RpcClient/API_REFERENCE.md diff --git a/neo.sln b/neo.sln index 1c0e92eafa..4cb2595b51 100644 --- a/neo.sln +++ b/neo.sln @@ -81,20 +81,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Extensions.Benchmarks", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Json.Benchmarks", "benchmarks\Neo.Json.Benchmarks\Neo.Json.Benchmarks.csproj", "{5F984D2B-793F-4683-B53A-80050E6E0286}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Network.RpcClient", "src\Neo.Network.RpcClient\Neo.Network.RpcClient.csproj", "{9ADB4E11-8655-42C2-8A75-E4436F56F17A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Cryptography.MPTTrie", "src\Neo.Cryptography.MPTTrie\Neo.Cryptography.MPTTrie.csproj", "{E384C5EF-493E-4ED6-813C-6364F968CEE8}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Cryptography.MPTTrie.Tests", "tests\Neo.Cryptography.MPTTrie.Tests\Neo.Cryptography.MPTTrie.Tests.csproj", "{40A23D45-1E81-41A4-B587-16AF26630103}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Network.RPC.Tests", "tests\Neo.Network.RPC.Tests\Neo.Network.RPC.Tests.csproj", "{19B1CF1A-17F4-4E04-AB9C-55CE74952E11}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SignClient", "src\Plugins\SignClient\SignClient.csproj", "{CAD55942-48A3-4526-979D-7519FADF19FE}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Plugins.SignClient.Tests", "tests\Neo.Plugins.SignClient.Tests\Neo.Plugins.SignClient.Tests.csproj", "{E2CFEAA1-45F2-4075-94ED-866862C6863F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Cryptography.MPTTrie.Benchmarks", "benchmarks\Neo.Cryptography.MPTTrie.Benchmarks\Neo.Cryptography.MPTTrie.Benchmarks.csproj", "{69B0D53B-D97A-4315-B205-CCEBB7289EA9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Network.RPC.Tests", "tests\Neo.Network.RPC.RpcClient.Tests\Neo.Network.RPC.Tests.csproj", "{A3D3F4B9-34C9-CE3E-FB14-14F450C462BE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RpcClient", "src\RpcClient\RpcClient.csproj", "{977B7BD7-93AE-14AD-CA79-91537F8964E5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -237,10 +237,6 @@ Global {5F984D2B-793F-4683-B53A-80050E6E0286}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F984D2B-793F-4683-B53A-80050E6E0286}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F984D2B-793F-4683-B53A-80050E6E0286}.Release|Any CPU.Build.0 = Release|Any CPU - {9ADB4E11-8655-42C2-8A75-E4436F56F17A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ADB4E11-8655-42C2-8A75-E4436F56F17A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ADB4E11-8655-42C2-8A75-E4436F56F17A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ADB4E11-8655-42C2-8A75-E4436F56F17A}.Release|Any CPU.Build.0 = Release|Any CPU {E384C5EF-493E-4ED6-813C-6364F968CEE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E384C5EF-493E-4ED6-813C-6364F968CEE8}.Debug|Any CPU.Build.0 = Debug|Any CPU {E384C5EF-493E-4ED6-813C-6364F968CEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -249,10 +245,6 @@ Global {40A23D45-1E81-41A4-B587-16AF26630103}.Debug|Any CPU.Build.0 = Debug|Any CPU {40A23D45-1E81-41A4-B587-16AF26630103}.Release|Any CPU.ActiveCfg = Release|Any CPU {40A23D45-1E81-41A4-B587-16AF26630103}.Release|Any CPU.Build.0 = Release|Any CPU - {19B1CF1A-17F4-4E04-AB9C-55CE74952E11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19B1CF1A-17F4-4E04-AB9C-55CE74952E11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19B1CF1A-17F4-4E04-AB9C-55CE74952E11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19B1CF1A-17F4-4E04-AB9C-55CE74952E11}.Release|Any CPU.Build.0 = Release|Any CPU {CAD55942-48A3-4526-979D-7519FADF19FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CAD55942-48A3-4526-979D-7519FADF19FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {CAD55942-48A3-4526-979D-7519FADF19FE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -265,6 +257,14 @@ Global {69B0D53B-D97A-4315-B205-CCEBB7289EA9}.Debug|Any CPU.Build.0 = Debug|Any CPU {69B0D53B-D97A-4315-B205-CCEBB7289EA9}.Release|Any CPU.ActiveCfg = Release|Any CPU {69B0D53B-D97A-4315-B205-CCEBB7289EA9}.Release|Any CPU.Build.0 = Release|Any CPU + {A3D3F4B9-34C9-CE3E-FB14-14F450C462BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A3D3F4B9-34C9-CE3E-FB14-14F450C462BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A3D3F4B9-34C9-CE3E-FB14-14F450C462BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A3D3F4B9-34C9-CE3E-FB14-14F450C462BE}.Release|Any CPU.Build.0 = Release|Any CPU + {977B7BD7-93AE-14AD-CA79-91537F8964E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {977B7BD7-93AE-14AD-CA79-91537F8964E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {977B7BD7-93AE-14AD-CA79-91537F8964E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {977B7BD7-93AE-14AD-CA79-91537F8964E5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -305,13 +305,13 @@ Global {77FDEE2E-9381-4BFC-B9E6-741EDBD6B90F} = {EDE05FA8-8E73-4924-BC63-DD117127EEE1} {B6CB2559-10F9-41AC-8D58-364BFEF9688B} = {C25EB0B0-0CAC-4CC1-8F36-F9229EFB99EC} {5F984D2B-793F-4683-B53A-80050E6E0286} = {C25EB0B0-0CAC-4CC1-8F36-F9229EFB99EC} - {9ADB4E11-8655-42C2-8A75-E4436F56F17A} = {B5339DF7-5D1D-43BA-B332-74B825E1770E} {E384C5EF-493E-4ED6-813C-6364F968CEE8} = {B5339DF7-5D1D-43BA-B332-74B825E1770E} {40A23D45-1E81-41A4-B587-16AF26630103} = {EDE05FA8-8E73-4924-BC63-DD117127EEE1} - {19B1CF1A-17F4-4E04-AB9C-55CE74952E11} = {EDE05FA8-8E73-4924-BC63-DD117127EEE1} {CAD55942-48A3-4526-979D-7519FADF19FE} = {C2DC830A-327A-42A7-807D-295216D30DBB} {E2CFEAA1-45F2-4075-94ED-866862C6863F} = {7F257712-D033-47FF-B439-9D4320D06599} {69B0D53B-D97A-4315-B205-CCEBB7289EA9} = {C25EB0B0-0CAC-4CC1-8F36-F9229EFB99EC} + {A3D3F4B9-34C9-CE3E-FB14-14F450C462BE} = {EDE05FA8-8E73-4924-BC63-DD117127EEE1} + {977B7BD7-93AE-14AD-CA79-91537F8964E5} = {B5339DF7-5D1D-43BA-B332-74B825E1770E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BCBA19D9-F868-4C6D-8061-A2B91E06E3EC} diff --git a/src/Neo.Network.RpcClient/ContractClient.cs b/src/RpcClient/ContractClient.cs similarity index 100% rename from src/Neo.Network.RpcClient/ContractClient.cs rename to src/RpcClient/ContractClient.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcAccount.cs b/src/RpcClient/Models/RpcAccount.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcAccount.cs rename to src/RpcClient/Models/RpcAccount.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcApplicationLog.cs b/src/RpcClient/Models/RpcApplicationLog.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcApplicationLog.cs rename to src/RpcClient/Models/RpcApplicationLog.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcBlock.cs b/src/RpcClient/Models/RpcBlock.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcBlock.cs rename to src/RpcClient/Models/RpcBlock.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcBlockHeader.cs b/src/RpcClient/Models/RpcBlockHeader.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcBlockHeader.cs rename to src/RpcClient/Models/RpcBlockHeader.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcContractState.cs b/src/RpcClient/Models/RpcContractState.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcContractState.cs rename to src/RpcClient/Models/RpcContractState.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcFoundStates.cs b/src/RpcClient/Models/RpcFoundStates.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcFoundStates.cs rename to src/RpcClient/Models/RpcFoundStates.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcInvokeResult.cs b/src/RpcClient/Models/RpcInvokeResult.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcInvokeResult.cs rename to src/RpcClient/Models/RpcInvokeResult.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcMethodToken.cs b/src/RpcClient/Models/RpcMethodToken.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcMethodToken.cs rename to src/RpcClient/Models/RpcMethodToken.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcNefFile.cs b/src/RpcClient/Models/RpcNefFile.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcNefFile.cs rename to src/RpcClient/Models/RpcNefFile.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcNep17Balances.cs b/src/RpcClient/Models/RpcNep17Balances.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcNep17Balances.cs rename to src/RpcClient/Models/RpcNep17Balances.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcNep17TokenInfo.cs b/src/RpcClient/Models/RpcNep17TokenInfo.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcNep17TokenInfo.cs rename to src/RpcClient/Models/RpcNep17TokenInfo.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcNep17Transfers.cs b/src/RpcClient/Models/RpcNep17Transfers.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcNep17Transfers.cs rename to src/RpcClient/Models/RpcNep17Transfers.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcPeers.cs b/src/RpcClient/Models/RpcPeers.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcPeers.cs rename to src/RpcClient/Models/RpcPeers.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcPlugin.cs b/src/RpcClient/Models/RpcPlugin.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcPlugin.cs rename to src/RpcClient/Models/RpcPlugin.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcRawMemPool.cs b/src/RpcClient/Models/RpcRawMemPool.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcRawMemPool.cs rename to src/RpcClient/Models/RpcRawMemPool.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcRequest.cs b/src/RpcClient/Models/RpcRequest.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcRequest.cs rename to src/RpcClient/Models/RpcRequest.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcResponse.cs b/src/RpcClient/Models/RpcResponse.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcResponse.cs rename to src/RpcClient/Models/RpcResponse.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcStateRoot.cs b/src/RpcClient/Models/RpcStateRoot.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcStateRoot.cs rename to src/RpcClient/Models/RpcStateRoot.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcTransaction.cs b/src/RpcClient/Models/RpcTransaction.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcTransaction.cs rename to src/RpcClient/Models/RpcTransaction.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcTransferOut.cs b/src/RpcClient/Models/RpcTransferOut.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcTransferOut.cs rename to src/RpcClient/Models/RpcTransferOut.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcUnclaimedGas.cs b/src/RpcClient/Models/RpcUnclaimedGas.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcUnclaimedGas.cs rename to src/RpcClient/Models/RpcUnclaimedGas.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcValidateAddressResult.cs b/src/RpcClient/Models/RpcValidateAddressResult.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcValidateAddressResult.cs rename to src/RpcClient/Models/RpcValidateAddressResult.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcValidator.cs b/src/RpcClient/Models/RpcValidator.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcValidator.cs rename to src/RpcClient/Models/RpcValidator.cs diff --git a/src/Neo.Network.RpcClient/Models/RpcVersion.cs b/src/RpcClient/Models/RpcVersion.cs similarity index 100% rename from src/Neo.Network.RpcClient/Models/RpcVersion.cs rename to src/RpcClient/Models/RpcVersion.cs diff --git a/src/Neo.Network.RpcClient/Nep17API.cs b/src/RpcClient/Nep17API.cs similarity index 100% rename from src/Neo.Network.RpcClient/Nep17API.cs rename to src/RpcClient/Nep17API.cs diff --git a/src/Neo.Network.RpcClient/PolicyAPI.cs b/src/RpcClient/PolicyAPI.cs similarity index 100% rename from src/Neo.Network.RpcClient/PolicyAPI.cs rename to src/RpcClient/PolicyAPI.cs diff --git a/src/Neo.Network.RpcClient/Properties/AssemblyInfo.cs b/src/RpcClient/Properties/AssemblyInfo.cs similarity index 100% rename from src/Neo.Network.RpcClient/Properties/AssemblyInfo.cs rename to src/RpcClient/Properties/AssemblyInfo.cs diff --git a/src/Neo.Network.RpcClient/README.md b/src/RpcClient/README.md similarity index 100% rename from src/Neo.Network.RpcClient/README.md rename to src/RpcClient/README.md diff --git a/src/Neo.Network.RpcClient/RpcClient.cs b/src/RpcClient/RpcClient.cs similarity index 100% rename from src/Neo.Network.RpcClient/RpcClient.cs rename to src/RpcClient/RpcClient.cs diff --git a/src/Neo.Network.RpcClient/Neo.Network.RpcClient.csproj b/src/RpcClient/RpcClient.csproj similarity index 100% rename from src/Neo.Network.RpcClient/Neo.Network.RpcClient.csproj rename to src/RpcClient/RpcClient.csproj diff --git a/src/Neo.Network.RpcClient/RpcException.cs b/src/RpcClient/RpcException.cs similarity index 100% rename from src/Neo.Network.RpcClient/RpcException.cs rename to src/RpcClient/RpcException.cs diff --git a/src/Neo.Network.RpcClient/StateAPI.cs b/src/RpcClient/StateAPI.cs similarity index 100% rename from src/Neo.Network.RpcClient/StateAPI.cs rename to src/RpcClient/StateAPI.cs diff --git a/src/Neo.Network.RpcClient/TransactionManager.cs b/src/RpcClient/TransactionManager.cs similarity index 100% rename from src/Neo.Network.RpcClient/TransactionManager.cs rename to src/RpcClient/TransactionManager.cs diff --git a/src/Neo.Network.RpcClient/TransactionManagerFactory.cs b/src/RpcClient/TransactionManagerFactory.cs similarity index 100% rename from src/Neo.Network.RpcClient/TransactionManagerFactory.cs rename to src/RpcClient/TransactionManagerFactory.cs diff --git a/src/Neo.Network.RpcClient/Utility.cs b/src/RpcClient/Utility.cs similarity index 100% rename from src/Neo.Network.RpcClient/Utility.cs rename to src/RpcClient/Utility.cs diff --git a/src/Neo.Network.RpcClient/WalletAPI.cs b/src/RpcClient/WalletAPI.cs similarity index 100% rename from src/Neo.Network.RpcClient/WalletAPI.cs rename to src/RpcClient/WalletAPI.cs diff --git a/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj b/tests/Neo.Network.RPC.RpcClient.Tests/Neo.Network.RPC.Tests.csproj similarity index 85% rename from tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj rename to tests/Neo.Network.RPC.RpcClient.Tests/Neo.Network.RPC.Tests.csproj index 1917755379..b66c7c4549 100644 --- a/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj +++ b/tests/Neo.Network.RPC.RpcClient.Tests/Neo.Network.RPC.Tests.csproj @@ -11,8 +11,8 @@ - + diff --git a/tests/Neo.Network.RPC.Tests/RpcTestCases.json b/tests/Neo.Network.RPC.RpcClient.Tests/RpcTestCases.json similarity index 100% rename from tests/Neo.Network.RPC.Tests/RpcTestCases.json rename to tests/Neo.Network.RPC.RpcClient.Tests/RpcTestCases.json diff --git a/tests/Neo.Network.RPC.Tests/TestUtils.cs b/tests/Neo.Network.RPC.RpcClient.Tests/TestUtils.cs similarity index 100% rename from tests/Neo.Network.RPC.Tests/TestUtils.cs rename to tests/Neo.Network.RPC.RpcClient.Tests/TestUtils.cs diff --git a/tests/Neo.Network.RPC.Tests/UT_ContractClient.cs b/tests/Neo.Network.RPC.RpcClient.Tests/UT_ContractClient.cs similarity index 100% rename from tests/Neo.Network.RPC.Tests/UT_ContractClient.cs rename to tests/Neo.Network.RPC.RpcClient.Tests/UT_ContractClient.cs diff --git a/tests/Neo.Network.RPC.Tests/UT_Nep17API.cs b/tests/Neo.Network.RPC.RpcClient.Tests/UT_Nep17API.cs similarity index 100% rename from tests/Neo.Network.RPC.Tests/UT_Nep17API.cs rename to tests/Neo.Network.RPC.RpcClient.Tests/UT_Nep17API.cs diff --git a/tests/Neo.Network.RPC.Tests/UT_PolicyAPI.cs b/tests/Neo.Network.RPC.RpcClient.Tests/UT_PolicyAPI.cs similarity index 100% rename from tests/Neo.Network.RPC.Tests/UT_PolicyAPI.cs rename to tests/Neo.Network.RPC.RpcClient.Tests/UT_PolicyAPI.cs diff --git a/tests/Neo.Network.RPC.Tests/UT_RpcClient.cs b/tests/Neo.Network.RPC.RpcClient.Tests/UT_RpcClient.cs similarity index 100% rename from tests/Neo.Network.RPC.Tests/UT_RpcClient.cs rename to tests/Neo.Network.RPC.RpcClient.Tests/UT_RpcClient.cs diff --git a/tests/Neo.Network.RPC.Tests/UT_RpcModels.cs b/tests/Neo.Network.RPC.RpcClient.Tests/UT_RpcModels.cs similarity index 100% rename from tests/Neo.Network.RPC.Tests/UT_RpcModels.cs rename to tests/Neo.Network.RPC.RpcClient.Tests/UT_RpcModels.cs diff --git a/tests/Neo.Network.RPC.Tests/UT_TransactionManager.cs b/tests/Neo.Network.RPC.RpcClient.Tests/UT_TransactionManager.cs similarity index 100% rename from tests/Neo.Network.RPC.Tests/UT_TransactionManager.cs rename to tests/Neo.Network.RPC.RpcClient.Tests/UT_TransactionManager.cs diff --git a/tests/Neo.Network.RPC.Tests/UT_Utility.cs b/tests/Neo.Network.RPC.RpcClient.Tests/UT_Utility.cs similarity index 100% rename from tests/Neo.Network.RPC.Tests/UT_Utility.cs rename to tests/Neo.Network.RPC.RpcClient.Tests/UT_Utility.cs diff --git a/tests/Neo.Network.RPC.Tests/UT_WalletAPI.cs b/tests/Neo.Network.RPC.RpcClient.Tests/UT_WalletAPI.cs similarity index 100% rename from tests/Neo.Network.RPC.Tests/UT_WalletAPI.cs rename to tests/Neo.Network.RPC.RpcClient.Tests/UT_WalletAPI.cs