diff --git a/.gitignore b/.gitignore index 94cac1eb..06995a4d 100644 --- a/.gitignore +++ b/.gitignore @@ -264,10 +264,10 @@ testrunner/ *.swo *.orig -LibskycoinNet/skycoin +LibSkyfiberNet/skycoin .directory #Code generate SWIG -lib/swig/LibskycoinNet/skycoin +lib/swig/LibSkyfiberNet/skycoin lib/swig/swig/include/libskycoin.h diff --git a/.travis/deploy.sh b/.travis/deploy.sh index d53dfabb..f1eae617 100644 --- a/.travis/deploy.sh +++ b/.travis/deploy.sh @@ -1,4 +1,4 @@ wget -c https://dist.nuget.org/win-x86-commandline/v5.1.0/nuget.exe -mono nuget.exe push ./lib/swig/LibskycoinNet/bin/Release/*.nupkg -Verbosity detailed -ApiKey $NUGET_API_KEY -Source $NUGET_SOURCE -SkipDuplicate +mono nuget.exe push ./lib/swig/LibskyfiberNet/bin/Release/*.nupkg -Verbosity detailed -ApiKey $NUGET_API_KEY -Source $NUGET_SOURCE -SkipDuplicate (cd ./lib/skyapi/src/Skyapi/ && nuget pack ./Skyapi.nuspec) mono nuget.exe push ./lib/skyapi/src/Skyapi/*.nupkg -Verbosity detailed -ApiKey $NUGET_API_KEY -Source $NUGET_SOURCE -SkipDuplicate diff --git a/Makefile b/Makefile index f8548d67..b71493fd 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ SHELL := /bin/bash MKFILE_PATH = $(abspath $(lastword $(MAKEFILE_LIST))) REPO_ROOT = $(dir $(MKFILE_PATH)) GOPATH_DIR = gopath -SKYLIBC_DIR ?= $(GOPATH_DIR)/src/github.com/fibercrypto/libskycoin +SKYLIBC_DIR ?= $(GOPATH_DIR)/src/github.com/fibercrypto/libskyfiber SKYCOIN_DIR ?= $(SKYLIBC_DIR)/vendor/github.com/skycoin/skycoin SKYBUILD_DIR = $(SKYLIBC_DIR)/build BUILDLIBC_DIR = $(SKYBUILD_DIR)/libskycoin @@ -63,7 +63,7 @@ else endif # Added by Swagger -LIB_SKYCOIN_DIR = gopath/src/github.com/fibercrypto/libskycoin +LIB_SKYCOIN_DIR = gopath/src/github.com/fibercrypto/libskyfiber SWAGGER_SPEC_DIR = $(LIB_SKYCOIN_DIR)/lib/swagger/skycoin.v0.26.0.openapi.v2.yml CSHARP_CLIENT_DIR = lib/skyapi CSHARP_SWIG_DIR = lib/swig @@ -99,43 +99,43 @@ build-swig: ## Generate C# C module from SWIG interfaces sed -i 's/#/%/g' $(CSHARP_SWIG_DIR)/swig/include/structs.i ;\ fi \ } - mkdir -p $(CSHARP_SWIG_DIR)/LibskycoinNet/skycoin + mkdir -p $(CSHARP_SWIG_DIR)/LibSkyfiberNet/skycoin rm -f $(CSHARP_SWIG_DIR)/swig/include/swig.h rm -f skycoinnet_wrap.o rm -f skycoinnet_wrap.c - swig -csharp -oldvarnames -namespace skycoin -I$(LIBSWIG_DIR)/include -I$(INCLUDE_DIR) -outdir $(CSHARP_SWIG_DIR)/LibskycoinNet/skycoin -o skycoinnet_wrap.c $(LIBSWIG_DIR)/libdotnet.i + swig -csharp -oldvarnames -namespace skycoin -I$(LIBSWIG_DIR)/include -I$(INCLUDE_DIR) -outdir $(CSHARP_SWIG_DIR)/LibSkyfiberNet/skycoin -o skycoinnet_wrap.c $(LIBSWIG_DIR)/libdotnet.i build-libskycoin-net: build-libc build-swig ## Build shared library including SWIG wrappers $(CC) -c -fpic -I$(CSHARP_SWIG_DIR)/swig/include -I$(INCLUDE_DIR) -libskycoin skycoinnet_wrap.c rm -rf build/usr/lib/$(LDNAME) $(CC) -shared skycoinnet_wrap.o $(BUILDLIBC_DIR)/libskycoin.a -o $(LDCOPY)/$(LDNAME) $(LDFLAGS) - mkdir -p $(CSHARP_SWIG_DIR)/LibskycoinNetTest/bin - mkdir -p $(CSHARP_SWIG_DIR)/LibskycoinNetTest/bin/Release - mkdir -p $(CSHARP_SWIG_DIR)/LibskycoinNetTest/bin/Release/netcoreapp2.2 - rm -rf $(CSHARP_SWIG_DIR)/LibskycoinNetTest/bin/Release/$(LDNAME) + mkdir -p $(CSHARP_SWIG_DIR)/LibSkyfiberNetTest/bin + mkdir -p $(CSHARP_SWIG_DIR)/LibSkyfiberNetTest/bin/Release + mkdir -p $(CSHARP_SWIG_DIR)/LibSkyfiberNetTest/bin/Release/netcoreapp2.2 + rm -rf $(CSHARP_SWIG_DIR)/LibSkyfiberNetTest/bin/Release/$(LDNAME) install-deps-mono: ## Install development dependencies by mono - nuget restore $(CSHARP_SWIG_DIR)/LibskycoinNet.sln + nuget restore $(CSHARP_SWIG_DIR)/LibSkyfiberNet.sln nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner install-deps-dotnet: ## Install development dependencies by dotnet - dotnet restore $(CSHARP_SWIG_DIR)/LibSkycoinDotNet.sln + dotnet restore $(CSHARP_SWIG_DIR)/LibSkyfiberDotNet.sln build-sln-dotnet: install-deps-dotnet build-libc build-swig - $(LDPATHVAR)="$(LDCOPY)" dotnet msbuild /p:VisualStudioVersion=15.0 /p:Configuration=Release $(CSHARP_SWIG_DIR)/LibSkycoinDotNet.sln + $(LDPATHVAR)="$(LDCOPY)" dotnet msbuild /p:VisualStudioVersion=15.0 /p:Configuration=Release $(CSHARP_SWIG_DIR)/LibSkyfiberDotNet.sln build-sln-mono: install-deps-mono build-libc build-swig - $(LDPATHVAR)="$(LDCOPY)" msbuild /p:VisualStudioVersion=15.0 /p:Configuration=Release $(CSHARP_SWIG_DIR)/LibskycoinNet.sln + $(LDPATHVAR)="$(LDCOPY)" msbuild /p:VisualStudioVersion=15.0 /p:Configuration=Release $(CSHARP_SWIG_DIR)/LibSkyfiberNet.sln build-dotnet: build-libskycoin-net build-sln-dotnet ## Build LibSkycoinNet Assembly by DotNet build-mono: build-libskycoin-net build-sln-mono ## Build LibSkycoinNet Assembly by Mono test-libsky-mono: build-mono ## Run LibSkycoinNet test suite mono - $(LDPATHVAR)="$(LDCOPY):$(LDPATHVAR)" mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe $(CSHARP_SWIG_DIR)/LibskycoinNetTest/bin/Release/LibskycoinNetTest.dll -labels + $(LDPATHVAR)="$(LDCOPY):$(LDPATHVAR)" mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe $(CSHARP_SWIG_DIR)/LibSkyfiberNetTest/bin/Release/LibSkyfiberNetTest.dll -labels test-libsky-dotnet: build-dotnet - $(LDPATHVAR)="$(LDCOPY):$(LDPATHVAR)" dotnet test -v n $(CSHARP_SWIG_DIR)/LibSkycoinDotNet.sln + $(LDPATHVAR)="$(LDCOPY):$(LDPATHVAR)" dotnet test -v n $(CSHARP_SWIG_DIR)/LibSkyfiberDotNet.sln build-skyapi: ## Build SkyApi Assembly (cd $(CSHARP_CLIENT_DIR) && /bin/sh build.sh) @@ -145,8 +145,8 @@ test-skyapi: ## Run SkyApi test suite lint: gendarme --v --config rules.xml --severity critical lib/skyapi/src/Skyapi/bin/Debug/Skyapi.dll - gendarme --v --config rules.xml --severity critical lib/swig/LibskycoinNet/bin/Release/netstandard2.0/LibSkycoinDotNet.dll - gendarme --v --config rules.xml --severity critical lib/swig/LibskycoinNet/bin/Release/LibskycoinNet.dll + gendarme --v --config rules.xml --severity critical lib/swig/LibSkyfiberNet/bin/Release/netstandard2.0/LibSkyfiberDotNet.dll + gendarme --v --config rules.xml --severity critical lib/swig/LibSkyfiberNet/bin/Release/LibskyfiberNet.dll clean: ## Clean all trash GOPATH="$(REPO_ROOT)/$(GOPATH_DIR)" make -C $(SKYLIBC_DIR) clean-libc diff --git a/README.md b/README.md index 24878daa..65c8a7be 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Libskycoin for .Net +# LibSkyfiber for .Net [![Build Status](https://travis-ci.org/libskycoin-dotnet.svg?branch=develop)](https://travis-ci.org/simelo/libskycoin-dotnet) @@ -61,13 +61,13 @@ For getting similar results using a graphical IDE interface consider package nam ### Install from sources Download the repository from http://github.com/simelo/libskycoin-dotnet.git. -Execute (`nuget restore LibskycoinNet.sln`) to install the library. Although executing (`nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner`) is a better choice for making changes to the library. However, when using tox these commands are not required at all because calling tox will make any necessary installation and execute the tests. +Execute (`nuget restore LibskyfiberNet.sln`) to install the library. Although executing (`nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner`) is a better choice for making changes to the library. However, when using tox these commands are not required at all because calling tox will make any necessary installation and execute the tests. ### Usage #### Naming -The exported function in Libskycoin .NET have the following naming format: `SKY_package_func_name` where package is replace by the package where the original Skycoin function is and func_name is the name of the function. For example, `LoadConfig` function from `cli` package is called in .Net `SKY_cli_LoadConfig` +The exported function in LibSkyfiber .NET have the following naming format: `SKY_package_func_name` where package is replace by the package where the original Skycoin function is and func_name is the name of the function. For example, `LoadConfig` function from `cli` package is called in .Net `SKY_cli_LoadConfig` #### Parameters @@ -84,12 +84,12 @@ Some of Skycoin types are too complex to be exported to a scripting language. So func (c Config) FullWalletPath() string ``` -Config is a struct type that is treated as a handle in Libskycoin .Net . The usage in .Net will be: +Config is a struct type that is treated as a handle in LibSkyfiber .Net . The usage in .Net will be: ```csharp using skycoin; -namespace LibskycoinNet +namespace LibskyfiberNet { public class Skycoin : skycoin.skycoin { @@ -306,7 +306,7 @@ $ make test 0. If the `master` branch has commits that are not in `develop` (e.g. due to a hotfix applied to `master`), merge `master` into `develop` (and fix any build or test failures) 0. Switch to a new release branch named `release-X.Y.Z` for preparing the release. 0. Ensure that the submodule at `gopath/src/github.com/skycoin/skycoin` is in sync with respect to the corresponding tag in https://github.com/skycoin/skycoin repository. -0. Update package version (`LibskycoinNet/LibskycoinNet.csproj`) +0. Update package version (`LibskyfiberNet/LibskyfiberNet.csproj`) 0. Run `make build` to make sure that the code base is up to date 0. Update `CHANGELOG.md`: move the "unreleased" changes to the version and add the date. 0. Follow the steps in [pre-release testing](#pre-release-testing) @@ -334,8 +334,8 @@ https://www.mono-project.com/download/stable/ ##### Building - msbuild /p:Configuration=Release LibskycoinNet.sln + msbuild /p:Configuration=Release LibskyfiberNet.sln -Final results are placed in the LibskycoinNet/bin/Release/ folder. +Final results are placed in the LibskyfiberNet/bin/Release/ folder. diff --git a/docker/images/dev-cli/README.md b/docker/images/dev-cli/README.md index 4fc2c699..693e3d14 100644 --- a/docker/images/dev-cli/README.md +++ b/docker/images/dev-cli/README.md @@ -4,9 +4,9 @@ - [`develop, dind, vscode, vscode-dind` (*docker/images/dev-cli/Dockerfile*)](https://github.com/simelo/libskycoin-dotnet/blob/develop/docker/images/dev-cli/Dockerfile) -# Libskycoin .NET CLI development image +# LibSkyfiber .NET CLI development image -This image has the necessary tools to build, test, edit, lint and version the Libskycoin .NET +This image has the necessary tools to build, test, edit, lint and version the LibSkyfiber .NET source code. It comes with Vim editor installed, along with some plugins to ease go development and version control with git. diff --git a/gopath/src/github.com/fibercrypto/libskyfiber b/gopath/src/github.com/fibercrypto/libskyfiber index 3081bc05..97967301 160000 --- a/gopath/src/github.com/fibercrypto/libskyfiber +++ b/gopath/src/github.com/fibercrypto/libskyfiber @@ -1 +1 @@ -Subproject commit 3081bc050aef5eea13229dd26d5ee111a429262b +Subproject commit 97967301f1308671287893a5ab93d92c95b7950c diff --git a/lib/swig/LibSkycoinDotNet.sln b/lib/swig/LibSkyfiberDotNet.sln similarity index 87% rename from lib/swig/LibSkycoinDotNet.sln rename to lib/swig/LibSkyfiberDotNet.sln index 676b24b8..244c25e5 100644 --- a/lib/swig/LibSkycoinDotNet.sln +++ b/lib/swig/LibSkyfiberDotNet.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26124.0 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibSkycoinDotNet", "LibskycoinNet\LibSkycoinDotNet.csproj", "{9A1DE0D2-E9C3-415D-A551-640C279EC8E1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibSkyfiberDotNet", "LibSkyfiberNet\LibSkyfiberDotNet.csproj", "{9A1DE0D2-E9C3-415D-A551-640C279EC8E1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibSkycoinDotNetTest", "LibskycoinNetTest\LibSkycoinDotNetTest.csproj", "{14C355AD-62A8-49D8-AD8F-3D09A44FACD0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibSkyfiberDotNetTest", "LibSkyfiberNetTest\LibSkyfiberDotNetTest.csproj", "{14C355AD-62A8-49D8-AD8F-3D09A44FACD0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/lib/swig/LibskycoinNet/LibSkycoinDotNet.csproj b/lib/swig/LibSkyfiberNet/LibSkyfiberDotNet.csproj similarity index 100% rename from lib/swig/LibskycoinNet/LibSkycoinDotNet.csproj rename to lib/swig/LibSkyfiberNet/LibSkyfiberDotNet.csproj diff --git a/lib/swig/LibskycoinNet/LibskycoinNet.csproj b/lib/swig/LibSkyfiberNet/LibSkyfiberNet.csproj similarity index 95% rename from lib/swig/LibskycoinNet/LibskycoinNet.csproj rename to lib/swig/LibSkyfiberNet/LibSkyfiberNet.csproj index 3cc1ea36..a49100ef 100644 --- a/lib/swig/LibskycoinNet/LibskycoinNet.csproj +++ b/lib/swig/LibSkyfiberNet/LibSkyfiberNet.csproj @@ -6,11 +6,11 @@ AnyCPU {C5320CD3-B673-461B-8899-19BB52862364} Library - LibskycoinNet - LibskycoinNet + LibskyfiberNet + LibskyfiberNet v4.5 true - LibskycoinNet + LibskyfiberNet 0.26.0 $(PackageVersion) 0.26.0 @@ -19,9 +19,9 @@ Maykel Arias - (stdevHan), Olemis Lang (olemis), Skycoin (skycoin) Skycoin client library for .NET Skycoin client library for .NET - https://github.com/simelo/libskycoin-dotnet + https://github.com/fibercrypto/libskyfiber-dotnet https://avatars3.githubusercontent.com/u/29321691?s=200&v=4 - https://github.com/simelo/libskycoin-dotnet + hhttps://github.com/fibercrypto/libskyfiber-dotnet skycoin;client-library;rest-client;restapi;rest-api;swagger;openapi;swig;dotnet;dotnet-library;csharp;csharp-library;pinvoke;pinvoke-wrapper;vbnet;dotnet-assembly true diff --git a/lib/swig/LibskycoinNet/Properties/AssemblyInfo.cs b/lib/swig/LibSkyfiberNet/Properties/AssemblyInfo.cs similarity index 95% rename from lib/swig/LibskycoinNet/Properties/AssemblyInfo.cs rename to lib/swig/LibSkyfiberNet/Properties/AssemblyInfo.cs index f0fb4c96..18c67921 100644 --- a/lib/swig/LibskycoinNet/Properties/AssemblyInfo.cs +++ b/lib/swig/LibSkyfiberNet/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -// [assembly: AssemblyTitle("LibskycoinNet")] +// [assembly: AssemblyTitle("LibskyfiberNet")] // [assembly: AssemblyDescription("")] // [assembly: AssemblyConfiguration("")] // [assembly: AssemblyCompany("")] diff --git a/lib/swig/LibskycoinNet/packages.config b/lib/swig/LibSkyfiberNet/packages.config similarity index 100% rename from lib/swig/LibskycoinNet/packages.config rename to lib/swig/LibSkyfiberNet/packages.config diff --git a/lib/swig/LibskycoinNetTest/LibSkycoinDotNetTest.csproj b/lib/swig/LibSkyfiberNetTest/LibSkyfiberDotNetTest.csproj similarity index 79% rename from lib/swig/LibskycoinNetTest/LibSkycoinDotNetTest.csproj rename to lib/swig/LibSkyfiberNetTest/LibSkyfiberDotNetTest.csproj index 01e4da3b..6be71a95 100644 --- a/lib/swig/LibskycoinNetTest/LibSkycoinDotNetTest.csproj +++ b/lib/swig/LibSkyfiberNetTest/LibSkyfiberDotNetTest.csproj @@ -13,9 +13,9 @@ - + {9A1DE0D2-E9C3-415D-A551-640C279EC8E1} - LibSkycoinDotNet + LibSkyfiberDotNet diff --git a/lib/swig/LibskycoinNetTest/LibskycoinNetTest.csproj b/lib/swig/LibSkyfiberNetTest/LibskyfiberNetTest.csproj similarity index 91% rename from lib/swig/LibskycoinNetTest/LibskycoinNetTest.csproj rename to lib/swig/LibSkyfiberNetTest/LibskyfiberNetTest.csproj index 8196e095..c0be84b0 100644 --- a/lib/swig/LibskycoinNetTest/LibskycoinNetTest.csproj +++ b/lib/swig/LibSkyfiberNetTest/LibskyfiberNetTest.csproj @@ -5,8 +5,8 @@ AnyCPU {DD16DD48-1CCF-478F-BD19-65A81780E7AB} Library - LibskycoinNetTest - LibskycoinNetTest + LibskyfiberNetTest + LibskyfiberNetTest v4.5 @@ -57,9 +57,9 @@ - + {C5320CD3-B673-461B-8899-19BB52862364} - LibskycoinNet + LibskyfiberNet diff --git a/lib/swig/LibskycoinNetTest/Properties/AssemblyInfo.cs b/lib/swig/LibSkyfiberNetTest/Properties/AssemblyInfo.cs similarity index 100% rename from lib/swig/LibskycoinNetTest/Properties/AssemblyInfo.cs rename to lib/swig/LibSkyfiberNetTest/Properties/AssemblyInfo.cs diff --git a/lib/swig/LibskycoinNetTest/check_cipher_address.cs b/lib/swig/LibSkyfiberNetTest/check_cipher_address.cs similarity index 99% rename from lib/swig/LibskycoinNetTest/check_cipher_address.cs rename to lib/swig/LibSkyfiberNetTest/check_cipher_address.cs index f0b71e39..45539677 100644 --- a/lib/swig/LibskycoinNetTest/check_cipher_address.cs +++ b/lib/swig/LibSkyfiberNetTest/check_cipher_address.cs @@ -1,7 +1,7 @@ using System; using NUnit.Framework; using skycoin; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] public class check_cipher_address : skycoin.skycoin diff --git a/lib/swig/LibskycoinNetTest/check_cipher_bip32.cs b/lib/swig/LibSkyfiberNetTest/check_cipher_bip32.cs similarity index 99% rename from lib/swig/LibskycoinNetTest/check_cipher_bip32.cs rename to lib/swig/LibSkyfiberNetTest/check_cipher_bip32.cs index ed37e2cd..3dc4d0de 100644 --- a/lib/swig/LibskycoinNetTest/check_cipher_bip32.cs +++ b/lib/swig/LibSkyfiberNetTest/check_cipher_bip32.cs @@ -1,7 +1,7 @@ using System; using NUnit.Framework; using skycoin; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] public class check_cipher_bip32 : skycoin.skycoin diff --git a/lib/swig/LibskycoinNetTest/check_cipher_bip44.cs b/lib/swig/LibSkyfiberNetTest/check_cipher_bip44.cs similarity index 99% rename from lib/swig/LibskycoinNetTest/check_cipher_bip44.cs rename to lib/swig/LibSkyfiberNetTest/check_cipher_bip44.cs index c4f447f4..bc1c5944 100644 --- a/lib/swig/LibskycoinNetTest/check_cipher_bip44.cs +++ b/lib/swig/LibSkyfiberNetTest/check_cipher_bip44.cs @@ -1,7 +1,7 @@ using System; using NUnit.Framework; using skycoin; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] public class check_cipher_bip44 : skycoin.skycoin diff --git a/lib/swig/LibskycoinNetTest/check_cipher_bitcoin.cs b/lib/swig/LibSkyfiberNetTest/check_cipher_bitcoin.cs similarity index 99% rename from lib/swig/LibskycoinNetTest/check_cipher_bitcoin.cs rename to lib/swig/LibSkyfiberNetTest/check_cipher_bitcoin.cs index ba9a5e2a..4a25534a 100644 --- a/lib/swig/LibskycoinNetTest/check_cipher_bitcoin.cs +++ b/lib/swig/LibSkyfiberNetTest/check_cipher_bitcoin.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using skycoin; using utils; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] public class check_cipher_bitcoin : skycoin.skycoin diff --git a/lib/swig/LibskycoinNetTest/check_cipher_crypto.cs b/lib/swig/LibSkyfiberNetTest/check_cipher_crypto.cs similarity index 99% rename from lib/swig/LibskycoinNetTest/check_cipher_crypto.cs rename to lib/swig/LibSkyfiberNetTest/check_cipher_crypto.cs index 68a9f3f4..7cdd31ab 100644 --- a/lib/swig/LibskycoinNetTest/check_cipher_crypto.cs +++ b/lib/swig/LibSkyfiberNetTest/check_cipher_crypto.cs @@ -1,7 +1,7 @@ using System; using NUnit.Framework; using skycoin; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] public class check_cipher_cryto : skycoin.skycoin diff --git a/lib/swig/LibskycoinNetTest/check_cipher_encrypt_scrypt_chacha20poly1305.cs b/lib/swig/LibSkyfiberNetTest/check_cipher_encrypt_scrypt_chacha20poly1305.cs similarity index 99% rename from lib/swig/LibskycoinNetTest/check_cipher_encrypt_scrypt_chacha20poly1305.cs rename to lib/swig/LibSkyfiberNetTest/check_cipher_encrypt_scrypt_chacha20poly1305.cs index 35af436e..2e4755a9 100644 --- a/lib/swig/LibskycoinNetTest/check_cipher_encrypt_scrypt_chacha20poly1305.cs +++ b/lib/swig/LibSkyfiberNetTest/check_cipher_encrypt_scrypt_chacha20poly1305.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using skycoin; using utils; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] public class check_cipher_encrypt_scrypt_chacha20poly1305 : skycoin.skycoin diff --git a/lib/swig/LibskycoinNetTest/check_cipher_hash.cs b/lib/swig/LibSkyfiberNetTest/check_cipher_hash.cs similarity index 99% rename from lib/swig/LibskycoinNetTest/check_cipher_hash.cs rename to lib/swig/LibSkyfiberNetTest/check_cipher_hash.cs index a0f2cc5a..d560f700 100644 --- a/lib/swig/LibskycoinNetTest/check_cipher_hash.cs +++ b/lib/swig/LibSkyfiberNetTest/check_cipher_hash.cs @@ -1,7 +1,7 @@ using System; using NUnit.Framework; using skycoin; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] public class check_cipher_hash : skycoin.skycoin diff --git a/lib/swig/LibskycoinNetTest/check_cipher_secp256k1.cs b/lib/swig/LibSkyfiberNetTest/check_cipher_secp256k1.cs similarity index 98% rename from lib/swig/LibskycoinNetTest/check_cipher_secp256k1.cs rename to lib/swig/LibSkyfiberNetTest/check_cipher_secp256k1.cs index f2aa6c1b..7803da79 100644 --- a/lib/swig/LibskycoinNetTest/check_cipher_secp256k1.cs +++ b/lib/swig/LibSkyfiberNetTest/check_cipher_secp256k1.cs @@ -1,7 +1,7 @@ using System; using NUnit.Framework; using skycoin; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] diff --git a/lib/swig/LibskycoinNetTest/check_coin_block.cs b/lib/swig/LibSkyfiberNetTest/check_coin_block.cs similarity index 99% rename from lib/swig/LibskycoinNetTest/check_coin_block.cs rename to lib/swig/LibSkyfiberNetTest/check_coin_block.cs index b095ab27..3eb2fbee 100644 --- a/lib/swig/LibskycoinNetTest/check_coin_block.cs +++ b/lib/swig/LibSkyfiberNetTest/check_coin_block.cs @@ -3,7 +3,7 @@ using skycoin; using utils; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] public class check_coin_block : skycoin.skycoin diff --git a/lib/swig/LibskycoinNetTest/check_coin_outputs.cs b/lib/swig/LibSkyfiberNetTest/check_coin_outputs.cs similarity index 99% rename from lib/swig/LibskycoinNetTest/check_coin_outputs.cs rename to lib/swig/LibSkyfiberNetTest/check_coin_outputs.cs index aef79a09..68df12c3 100644 --- a/lib/swig/LibskycoinNetTest/check_coin_outputs.cs +++ b/lib/swig/LibSkyfiberNetTest/check_coin_outputs.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using skycoin; using utils; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] public class check_coin_outputs : skycoin.skycoin diff --git a/lib/swig/LibskycoinNetTest/check_coin_transactions.cs b/lib/swig/LibSkyfiberNetTest/check_coin_transactions.cs similarity index 99% rename from lib/swig/LibskycoinNetTest/check_coin_transactions.cs rename to lib/swig/LibSkyfiberNetTest/check_coin_transactions.cs index 30c5470c..b96a8b01 100644 --- a/lib/swig/LibskycoinNetTest/check_coin_transactions.cs +++ b/lib/swig/LibSkyfiberNetTest/check_coin_transactions.cs @@ -4,7 +4,7 @@ using utils; using System.Threading; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] public class check_coin_transactions : skycoin.skycoin diff --git a/lib/swig/LibskycoinNetTest/check_util_droplet.cs b/lib/swig/LibSkyfiberNetTest/check_util_droplet.cs similarity index 99% rename from lib/swig/LibskycoinNetTest/check_util_droplet.cs rename to lib/swig/LibSkyfiberNetTest/check_util_droplet.cs index 3a71107b..87dd62fb 100644 --- a/lib/swig/LibskycoinNetTest/check_util_droplet.cs +++ b/lib/swig/LibSkyfiberNetTest/check_util_droplet.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using skycoin; using utils; -namespace LibskycoinNetTest { +namespace LibskyfiberNetTest { [TestFixture ()] public class check_util_droplet : skycoin.skycoin { diff --git a/lib/swig/LibskycoinNetTest/check_util_fee.cs b/lib/swig/LibSkyfiberNetTest/check_util_fee.cs similarity index 99% rename from lib/swig/LibskycoinNetTest/check_util_fee.cs rename to lib/swig/LibSkyfiberNetTest/check_util_fee.cs index 3a8a424f..1641e2da 100644 --- a/lib/swig/LibskycoinNetTest/check_util_fee.cs +++ b/lib/swig/LibSkyfiberNetTest/check_util_fee.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using skycoin; using utils; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] public class check_util_fee : skycoin.skycoin diff --git a/lib/swig/LibskycoinNetTest/check_util_math.cs b/lib/swig/LibSkyfiberNetTest/check_util_math.cs similarity index 98% rename from lib/swig/LibskycoinNetTest/check_util_math.cs rename to lib/swig/LibSkyfiberNetTest/check_util_math.cs index 113c0d52..e76e79a0 100644 --- a/lib/swig/LibskycoinNetTest/check_util_math.cs +++ b/lib/swig/LibSkyfiberNetTest/check_util_math.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using skycoin; using utils; -namespace LibskycoinNetTest { +namespace LibskyfiberNetTest { [TestFixture ()] public class check_util_math : skycoin.skycoin { diff --git a/lib/swig/LibskycoinNetTest/check_util_param_distributions.cs b/lib/swig/LibSkyfiberNetTest/check_util_param_distributions.cs similarity index 98% rename from lib/swig/LibskycoinNetTest/check_util_param_distributions.cs rename to lib/swig/LibSkyfiberNetTest/check_util_param_distributions.cs index 24c06661..59565027 100644 --- a/lib/swig/LibskycoinNetTest/check_util_param_distributions.cs +++ b/lib/swig/LibSkyfiberNetTest/check_util_param_distributions.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using skycoin; using utils; -namespace LibskycoinNetTest +namespace LibskyfiberNetTest { [TestFixture()] public class check_util_param_distributions : skycoin.skycoin diff --git a/lib/swig/LibskycoinNetTest/packages.config b/lib/swig/LibSkyfiberNetTest/packages.config similarity index 100% rename from lib/swig/LibskycoinNetTest/packages.config rename to lib/swig/LibSkyfiberNetTest/packages.config diff --git a/lib/swig/LibskycoinNetTest/transutils.cs b/lib/swig/LibSkyfiberNetTest/transutils.cs similarity index 100% rename from lib/swig/LibskycoinNetTest/transutils.cs rename to lib/swig/LibSkyfiberNetTest/transutils.cs diff --git a/lib/swig/LibskycoinNet.sln b/lib/swig/LibskyfiberNet.sln similarity index 74% rename from lib/swig/LibskycoinNet.sln rename to lib/swig/LibskyfiberNet.sln index 2c650a6c..851e0606 100644 --- a/lib/swig/LibskycoinNet.sln +++ b/lib/swig/LibskyfiberNet.sln @@ -1,9 +1,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibskycoinNet", "LibskycoinNet\LibskycoinNet.csproj", "{C5320CD3-B673-461B-8899-19BB52862364}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibSkyfiberNet", "LibSkyfiberNet\LibSkyfiberNet.csproj", "{C5320CD3-B673-461B-8899-19BB52862364}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibskycoinNetTest", "LibskycoinNetTest\LibskycoinNetTest.csproj", "{DD16DD48-1CCF-478F-BD19-65A81780E7AB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibSkyfiberNetTest", "LibSkyfiberNetTest\LibSkyfiberNetTest.csproj", "{DD16DD48-1CCF-478F-BD19-65A81780E7AB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/lib/swig/swig/libdotnet.i b/lib/swig/swig/libdotnet.i index ee521833..42a2a569 100644 --- a/lib/swig/swig/libdotnet.i +++ b/lib/swig/swig/libdotnet.i @@ -7,8 +7,8 @@ #include "swig.h" #include "skyerrors.h" %} -%include "/gopath/src/github.com/fibercrypto/libskycoin/lib/swig/common/common.i" -%include "/gopath/src/github.com/fibercrypto/libskycoin/lib/swig//static/static.i" +%include "/gopath/src/github.com/fibercrypto/libskyfiber/lib/swig/common/common.i" +%include "/gopath/src/github.com/fibercrypto/libskyfiber/lib/swig//static/static.i" %include "csharp_typemap.i" %include "csharp_structs_typemaps.i" %include "csharp_basic.i"