[restsharp] refs skycoin#86 Solving requested changes for PR

simelo · Mar 13, 2019 · 8f8d7d4 · 8f8d7d4
1 parent fc9850b
commit 8f8d7d4
Show file tree

Hide file tree

Showing 96 changed files with 15 additions and 2,331 deletions.
diff --git a/.travis/install-linux.sh b/.travis/install-linux.sh
@@ -18,8 +18,8 @@ chmod +x "$HOME/bin/gimme"
 # Install Python libraries
 $PIP install --upgrade pip setuptools tox-travis
 $PIP install -r "$REPO_ROOT/requirements.dev.txt"
-$PIP install -r "$REPO_ROOT/pysky_api/requirements.txt"
-$PIP install -r "$REPO_ROOT/pysky_api/test-requirements.txt"
+$PIP install -r "$REPO_ROOT/skyapi/requirements.txt"
+$PIP install -r "$REPO_ROOT/skyapi/test-requirements.txt"
 
 # Compile SWIG
 mkdir swig_build && \

diff --git a/Makefile b/Makefile
@@ -1,12 +1,12 @@
 .DEFAULT_GOAL := help
-.PHONY: configure build-libc build-swig develop build-libc-swig build build-pysky_api
+.PHONY: configure build-libc build-swig develop build-libc-swig build
 .PHONY: test test-ci help
 
 # Compilation output
 .ONESHELL:
 SHELL := /bin/bash
 
-PYTHON_BIN = python
+PYTHON = python
 PWD = $(shell pwd)
 GOPATH_DIR = $(PWD)/gopath
 SKYCOIN_DIR = gopath/src/github.com/skycoin/skycoin
@@ -25,7 +25,7 @@ SRC_FILES = $(shell find $(SKYCOIN_DIR)/src -type f -name "*.go")
 SWIG_FILES = $(shell find $(LIBSWIG_DIR) -type f -name "*.i")
 HEADER_FILES = $(shell find $(SKYCOIN_DIR)/include -type f -name "*.h")
 
-PYTHON_CLIENT_DIR = pysky_api
+PYTHON_CLIENT_DIR = skyapi
 
 ifeq ($(shell uname -s),Linux)
 	TEMP_DIR = tmp
@@ -38,11 +38,6 @@ configure: ## Configure build environment
 	mkdir -p $(BUILDLIBC_DIR) $(BIN_DIR) $(INCLUDE_DIR)
 	mkdir -p $(DIST_DIR)
 
-generate-python-Client: ## Configure build environment
-	mkdir -p $(BUILD_DIR)/usr/tmp $(BUILD_DIR)/usr/lib $(BUILD_DIR)/usr/include
-	mkdir -p $(BUILDLIBC_DIR) $(BIN_DIR) $(INCLUDE_DIR)
-	mkdir -p $(DIST_DIR)
-
 $(BUILDLIBC_DIR)/libskycoin.a: $(LIB_FILES) $(SRC_FILES) $(HEADER_FILES)
 	rm -f $(BUILDLIBC_DIR)/libskycoin.a
 	GOPATH="$(GOPATH_DIR)" make -C $(SKYCOIN_DIR) build-libc-static
@@ -72,30 +67,30 @@ build-swig: ## Generate Python C module from SWIG interfaces
 	swig -python -Iswig/include -I$(INCLUDE_DIR) -outdir ./skycoin/ -o swig/pyskycoin_wrap.c $(LIBSWIG_DIR)/pyskycoin.i
 
 develop: ## Install PySkycoin for development
-	$(PYTHON_BIN) setup.py develop
-	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON_BIN) setup.py develop)
+	$(PYTHON) setup.py develop
+	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py develop)
 
 build-libc-swig: build-libc build-swig
 
 build: build-libc-swig ## Build PySkycoin Python package
-	$(PYTHON_BIN) setup.py build
-	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON_BIN) setup.py build)
+	$(PYTHON) setup.py build
+	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py build)
 
 test-ci: ## Run tests on (Travis) CI build
 	tox
 	(cd $(PYTHON_CLIENT_DIR) && tox)
 
 test: build-libc build-swig develop ## Run project test suite
-	$(PYTHON_BIN) setup.py test
-	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON_BIN) setup.py test)
+	$(PYTHON) setup.py test
+	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py test)
 
 sdist: ## Create source distribution archive
-	$(PYTHON_BIN) setup.py sdist --formats=gztar
-	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON_BIN) setup.py sdist --formats=gztar)
+	$(PYTHON) setup.py sdist --formats=gztar
+	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py sdist --formats=gztar)
 
 bdist_wheel: ## Create architecture-specific binary wheel distribution archive
-	$(PYTHON_BIN) setup.py bdist_wheel
-	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON_BIN) setup.py bdist_wheel)
+	$(PYTHON) setup.py bdist_wheel
+	(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py bdist_wheel)
 
 # FIXME: After libskycoin 32-bits binaries add bdist_manylinux_i686
 bdist_manylinux: bdist_manylinux_amd64 ## Create multilinux binary wheel distribution archives

diff --git a/pysky_api/.gitignore → skyapi/.gitignore b/pysky_api/.gitignore → skyapi/.gitignore
diff --git a/pysky_api/.openapi-generator-ignore → skyapi/.openapi-generator-ignore b/pysky_api/.openapi-generator-ignore → skyapi/.openapi-generator-ignore
diff --git a/pysky_api/.openapi-generator/VERSION → skyapi/.openapi-generator/VERSION b/pysky_api/.openapi-generator/VERSION → skyapi/.openapi-generator/VERSION
diff --git a/pysky_api/.travis.yml → skyapi/.travis.yml b/pysky_api/.travis.yml → skyapi/.travis.yml
diff --git a/pysky_api/README.md → skyapi/README.md b/pysky_api/README.md → skyapi/README.md
diff --git a/pysky_api/docs/Apiv1exploreraddressInputs.md → skyapi/docs/Apiv1exploreraddressInputs.md b/pysky_api/docs/Apiv1exploreraddressInputs.md → skyapi/docs/Apiv1exploreraddressInputs.md
diff --git a/...y_api/docs/Apiv1exploreraddressOutputs.md → skyapi/docs/Apiv1exploreraddressOutputs.md b/...y_api/docs/Apiv1exploreraddressOutputs.md → skyapi/docs/Apiv1exploreraddressOutputs.md
diff --git a/pysky_api/docs/Apiv1exploreraddressStatus.md → skyapi/docs/Apiv1exploreraddressStatus.md b/pysky_api/docs/Apiv1exploreraddressStatus.md → skyapi/docs/Apiv1exploreraddressStatus.md
diff --git a/pysky_api/docs/Apiv1pendingTxsTransaction.md → skyapi/docs/Apiv1pendingTxsTransaction.md b/pysky_api/docs/Apiv1pendingTxsTransaction.md → skyapi/docs/Apiv1pendingTxsTransaction.md
diff --git a/pysky_api/docs/Apiv1walletsEntries.md → skyapi/docs/Apiv1walletsEntries.md b/pysky_api/docs/Apiv1walletsEntries.md → skyapi/docs/Apiv1walletsEntries.md
diff --git a/pysky_api/docs/Apiv1walletsMeta.md → skyapi/docs/Apiv1walletsMeta.md b/pysky_api/docs/Apiv1walletsMeta.md → skyapi/docs/Apiv1walletsMeta.md
diff --git a/...s/Apiv1wallettransactionHoursSelection.md → ...s/Apiv1wallettransactionHoursSelection.md b/...s/Apiv1wallettransactionHoursSelection.md → ...s/Apiv1wallettransactionHoursSelection.md
diff --git a/pysky_api/docs/Apiv1wallettransactionTo.md → skyapi/docs/Apiv1wallettransactionTo.md b/pysky_api/docs/Apiv1wallettransactionTo.md → skyapi/docs/Apiv1wallettransactionTo.md
diff --git a/..._api/docs/Apiv1wallettransactionWallet.md → skyapi/docs/Apiv1wallettransactionWallet.md b/..._api/docs/Apiv1wallettransactionWallet.md → skyapi/docs/Apiv1wallettransactionWallet.md
diff --git a/pysky_api/docs/DefaultApi.md → skyapi/docs/DefaultApi.md b/pysky_api/docs/DefaultApi.md → skyapi/docs/DefaultApi.md
diff --git a/pysky_api/docs/InlineObject.md → skyapi/docs/InlineObject.md b/pysky_api/docs/InlineObject.md → skyapi/docs/InlineObject.md
diff --git a/pysky_api/docs/InlineResponse200.md → skyapi/docs/InlineResponse200.md b/pysky_api/docs/InlineResponse200.md → skyapi/docs/InlineResponse200.md
diff --git a/pysky_api/docs/InlineResponse2001.md → skyapi/docs/InlineResponse2001.md b/pysky_api/docs/InlineResponse2001.md → skyapi/docs/InlineResponse2001.md
diff --git a/pysky_api/docs/InlineResponse2002.md → skyapi/docs/InlineResponse2002.md b/pysky_api/docs/InlineResponse2002.md → skyapi/docs/InlineResponse2002.md
diff --git a/pysky_api/docs/InlineResponse2003.md → skyapi/docs/InlineResponse2003.md b/pysky_api/docs/InlineResponse2003.md → skyapi/docs/InlineResponse2003.md
diff --git a/...sponse2003UnconfirmedVerifyTransaction.md → ...sponse2003UnconfirmedVerifyTransaction.md b/...sponse2003UnconfirmedVerifyTransaction.md → ...sponse2003UnconfirmedVerifyTransaction.md
diff --git a/pysky_api/docs/InlineResponse2004.md → skyapi/docs/InlineResponse2004.md b/pysky_api/docs/InlineResponse2004.md → skyapi/docs/InlineResponse2004.md
diff --git a/pysky_api/docs/InlineResponse2005.md → skyapi/docs/InlineResponse2005.md b/pysky_api/docs/InlineResponse2005.md → skyapi/docs/InlineResponse2005.md
diff --git a/pysky_api/docs/InlineResponse2006.md → skyapi/docs/InlineResponse2006.md b/pysky_api/docs/InlineResponse2006.md → skyapi/docs/InlineResponse2006.md
diff --git a/pysky_api/docs/InlineResponse2007.md → skyapi/docs/InlineResponse2007.md b/pysky_api/docs/InlineResponse2007.md → skyapi/docs/InlineResponse2007.md
diff --git a/pysky_api/docs/InlineResponse2007Data.md → skyapi/docs/InlineResponse2007Data.md b/pysky_api/docs/InlineResponse2007Data.md → skyapi/docs/InlineResponse2007Data.md
diff --git a/pysky_api/docs/InlineResponseDefault.md → skyapi/docs/InlineResponseDefault.md b/pysky_api/docs/InlineResponseDefault.md → skyapi/docs/InlineResponseDefault.md
diff --git a/pysky_api/git_push.sh → skyapi/git_push.sh b/pysky_api/git_push.sh → skyapi/git_push.sh
diff --git a/pysky_api/openapi_client/__init__.py → skyapi/openapi_client/__init__.py b/pysky_api/openapi_client/__init__.py → skyapi/openapi_client/__init__.py
diff --git a/pysky_api/openapi_client/api/__init__.py → skyapi/openapi_client/api/__init__.py b/pysky_api/openapi_client/api/__init__.py → skyapi/openapi_client/api/__init__.py
diff --git a/pysky_api/openapi_client/api/default_api.py → skyapi/openapi_client/api/default_api.py b/pysky_api/openapi_client/api/default_api.py → skyapi/openapi_client/api/default_api.py
diff --git a/pysky_api/openapi_client/api_client.py → skyapi/openapi_client/api_client.py b/pysky_api/openapi_client/api_client.py → skyapi/openapi_client/api_client.py
diff --git a/pysky_api/openapi_client/configuration.py → skyapi/openapi_client/configuration.py b/pysky_api/openapi_client/configuration.py → skyapi/openapi_client/configuration.py
diff --git a/pysky_api/openapi_client/models/__init__.py → skyapi/openapi_client/models/__init__.py b/pysky_api/openapi_client/models/__init__.py → skyapi/openapi_client/models/__init__.py
diff --git a/...ent/models/apiv1exploreraddress_inputs.py → ...ent/models/apiv1exploreraddress_inputs.py b/...ent/models/apiv1exploreraddress_inputs.py → ...ent/models/apiv1exploreraddress_inputs.py
diff --git a/...nt/models/apiv1exploreraddress_outputs.py → ...nt/models/apiv1exploreraddress_outputs.py b/...nt/models/apiv1exploreraddress_outputs.py → ...nt/models/apiv1exploreraddress_outputs.py
diff --git a/...ent/models/apiv1exploreraddress_status.py → ...ent/models/apiv1exploreraddress_status.py b/...ent/models/apiv1exploreraddress_status.py → ...ent/models/apiv1exploreraddress_status.py
diff --git a/...nt/models/apiv1pending_txs_transaction.py → ...nt/models/apiv1pending_txs_transaction.py b/...nt/models/apiv1pending_txs_transaction.py → ...nt/models/apiv1pending_txs_transaction.py
diff --git a/...api_client/models/apiv1wallets_entries.py → ...api_client/models/apiv1wallets_entries.py b/...api_client/models/apiv1wallets_entries.py → ...api_client/models/apiv1wallets_entries.py
diff --git a/...penapi_client/models/apiv1wallets_meta.py → ...penapi_client/models/apiv1wallets_meta.py b/...penapi_client/models/apiv1wallets_meta.py → ...penapi_client/models/apiv1wallets_meta.py
diff --git a/...apiv1wallettransaction_hours_selection.py → ...apiv1wallettransaction_hours_selection.py b/...apiv1wallettransaction_hours_selection.py → ...apiv1wallettransaction_hours_selection.py
diff --git a/...lient/models/apiv1wallettransaction_to.py → ...lient/models/apiv1wallettransaction_to.py b/...lient/models/apiv1wallettransaction_to.py → ...lient/models/apiv1wallettransaction_to.py
diff --git a/...t/models/apiv1wallettransaction_wallet.py → ...t/models/apiv1wallettransaction_wallet.py b/...t/models/apiv1wallettransaction_wallet.py → ...t/models/apiv1wallettransaction_wallet.py
diff --git a/...pi/openapi_client/models/inline_object.py → ...pi/openapi_client/models/inline_object.py b/...pi/openapi_client/models/inline_object.py → ...pi/openapi_client/models/inline_object.py
diff --git a/...enapi_client/models/inline_response200.py → ...enapi_client/models/inline_response200.py b/...enapi_client/models/inline_response200.py → ...enapi_client/models/inline_response200.py
diff --git a/...napi_client/models/inline_response2001.py → ...napi_client/models/inline_response2001.py b/...napi_client/models/inline_response2001.py → ...napi_client/models/inline_response2001.py
diff --git a/...napi_client/models/inline_response2002.py → ...napi_client/models/inline_response2002.py b/...napi_client/models/inline_response2002.py → ...napi_client/models/inline_response2002.py
diff --git a/...napi_client/models/inline_response2003.py → ...napi_client/models/inline_response2003.py b/...napi_client/models/inline_response2003.py → ...napi_client/models/inline_response2003.py
diff --git a/...nse2003_unconfirmed_verify_transaction.py → ...nse2003_unconfirmed_verify_transaction.py b/...nse2003_unconfirmed_verify_transaction.py → ...nse2003_unconfirmed_verify_transaction.py
diff --git a/...napi_client/models/inline_response2004.py → ...napi_client/models/inline_response2004.py b/...napi_client/models/inline_response2004.py → ...napi_client/models/inline_response2004.py
diff --git a/...napi_client/models/inline_response2005.py → ...napi_client/models/inline_response2005.py b/...napi_client/models/inline_response2005.py → ...napi_client/models/inline_response2005.py
diff --git a/...napi_client/models/inline_response2006.py → ...napi_client/models/inline_response2006.py b/...napi_client/models/inline_response2006.py → ...napi_client/models/inline_response2006.py
diff --git a/...napi_client/models/inline_response2007.py → ...napi_client/models/inline_response2007.py b/...napi_client/models/inline_response2007.py → ...napi_client/models/inline_response2007.py
diff --git a/...client/models/inline_response2007_data.py → ...client/models/inline_response2007_data.py b/...client/models/inline_response2007_data.py → ...client/models/inline_response2007_data.py
diff --git a/..._client/models/inline_response_default.py → ..._client/models/inline_response_default.py b/..._client/models/inline_response_default.py → ..._client/models/inline_response_default.py
diff --git a/pysky_api/openapi_client/rest.py → skyapi/openapi_client/rest.py b/pysky_api/openapi_client/rest.py → skyapi/openapi_client/rest.py
diff --git a/pysky_api/requirements.txt → skyapi/requirements.txt b/pysky_api/requirements.txt → skyapi/requirements.txt
diff --git a/pysky_api/setup.py → skyapi/setup.py b/pysky_api/setup.py → skyapi/setup.py
diff --git a/pysky_api/test-requirements.txt → skyapi/test-requirements.txt b/pysky_api/test-requirements.txt → skyapi/test-requirements.txt
diff --git a/pysky_api/test/__init__.py → skyapi/test/__init__.py b/pysky_api/test/__init__.py → skyapi/test/__init__.py
diff --git a/.../test/test_apiv1exploreraddress_inputs.py → .../test/test_apiv1exploreraddress_inputs.py b/.../test/test_apiv1exploreraddress_inputs.py → .../test/test_apiv1exploreraddress_inputs.py
diff --git a/...test/test_apiv1exploreraddress_outputs.py → ...test/test_apiv1exploreraddress_outputs.py b/...test/test_apiv1exploreraddress_outputs.py → ...test/test_apiv1exploreraddress_outputs.py
diff --git a/.../test/test_apiv1exploreraddress_status.py → .../test/test_apiv1exploreraddress_status.py b/.../test/test_apiv1exploreraddress_status.py → .../test/test_apiv1exploreraddress_status.py
diff --git a/...test/test_apiv1pending_txs_transaction.py → ...test/test_apiv1pending_txs_transaction.py b/...test/test_apiv1pending_txs_transaction.py → ...test/test_apiv1pending_txs_transaction.py
diff --git a/pysky_api/test/test_apiv1wallets_entries.py → skyapi/test/test_apiv1wallets_entries.py b/pysky_api/test/test_apiv1wallets_entries.py → skyapi/test/test_apiv1wallets_entries.py
diff --git a/pysky_api/test/test_apiv1wallets_meta.py → skyapi/test/test_apiv1wallets_meta.py b/pysky_api/test/test_apiv1wallets_meta.py → skyapi/test/test_apiv1wallets_meta.py
diff --git a/...apiv1wallettransaction_hours_selection.py → ...apiv1wallettransaction_hours_selection.py b/...apiv1wallettransaction_hours_selection.py → ...apiv1wallettransaction_hours_selection.py
diff --git a/...pi/test/test_apiv1wallettransaction_to.py → ...pi/test/test_apiv1wallettransaction_to.py b/...pi/test/test_apiv1wallettransaction_to.py → ...pi/test/test_apiv1wallettransaction_to.py
diff --git a/...est/test_apiv1wallettransaction_wallet.py → ...est/test_apiv1wallettransaction_wallet.py b/...est/test_apiv1wallettransaction_wallet.py → ...est/test_apiv1wallettransaction_wallet.py
diff --git a/pysky_api/test/test_default_api.py → skyapi/test/test_default_api.py b/pysky_api/test/test_default_api.py → skyapi/test/test_default_api.py
diff --git a/pysky_api/test/test_inline_object.py → skyapi/test/test_inline_object.py b/pysky_api/test/test_inline_object.py → skyapi/test/test_inline_object.py
diff --git a/pysky_api/test/test_inline_response200.py → skyapi/test/test_inline_response200.py b/pysky_api/test/test_inline_response200.py → skyapi/test/test_inline_response200.py
diff --git a/pysky_api/test/test_inline_response2001.py → skyapi/test/test_inline_response2001.py b/pysky_api/test/test_inline_response2001.py → skyapi/test/test_inline_response2001.py
diff --git a/pysky_api/test/test_inline_response2002.py → skyapi/test/test_inline_response2002.py b/pysky_api/test/test_inline_response2002.py → skyapi/test/test_inline_response2002.py
diff --git a/pysky_api/test/test_inline_response2003.py → skyapi/test/test_inline_response2003.py b/pysky_api/test/test_inline_response2003.py → skyapi/test/test_inline_response2003.py
diff --git a/...nse2003_unconfirmed_verify_transaction.py → ...nse2003_unconfirmed_verify_transaction.py b/...nse2003_unconfirmed_verify_transaction.py → ...nse2003_unconfirmed_verify_transaction.py
diff --git a/pysky_api/test/test_inline_response2004.py → skyapi/test/test_inline_response2004.py b/pysky_api/test/test_inline_response2004.py → skyapi/test/test_inline_response2004.py
diff --git a/pysky_api/test/test_inline_response2005.py → skyapi/test/test_inline_response2005.py b/pysky_api/test/test_inline_response2005.py → skyapi/test/test_inline_response2005.py
diff --git a/pysky_api/test/test_inline_response2006.py → skyapi/test/test_inline_response2006.py b/pysky_api/test/test_inline_response2006.py → skyapi/test/test_inline_response2006.py
diff --git a/pysky_api/test/test_inline_response2007.py → skyapi/test/test_inline_response2007.py b/pysky_api/test/test_inline_response2007.py → skyapi/test/test_inline_response2007.py
diff --git a/...api/test/test_inline_response2007_data.py → skyapi/test/test_inline_response2007_data.py b/...api/test/test_inline_response2007_data.py → skyapi/test/test_inline_response2007_data.py
diff --git a/..._api/test/test_inline_response_default.py → skyapi/test/test_inline_response_default.py b/..._api/test/test_inline_response_default.py → skyapi/test/test_inline_response_default.py
diff --git a/pysky_api/tox.ini → skyapi/tox.ini b/pysky_api/tox.ini → skyapi/tox.ini
diff --git a/skycoin/restapi/__init__.py b/skycoin/restapi/__init__.py
diff --git a/skycoin/restapi/api/__init__.py b/skycoin/restapi/api/__init__.py