Skip to content

Commit

Permalink
Rename service to Safe Transaction Service
Browse files Browse the repository at this point in the history
  • Loading branch information
Uxio0 committed Jun 19, 2019
1 parent 2353a63 commit e7796d4
Show file tree
Hide file tree
Showing 37 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PYTHONPATH=/app/safe_transaction_history
PYTHONPATH=/app/safe_transaction_service
DJANGO_SETTINGS_MODULE=config.settings.local
C_FORCE_ROOT=true
DEBUG=0
Expand All @@ -7,4 +7,4 @@ ETHEREUM_NODE_URL=http://ganache:8545
DATABASE_URL=psql://postgres@db:5432/postgres
BROKER_URL=redis://redis:6379/0
REDIS_URL=redis://redis:6379/1
CELERY_BROKER_URL=redis://redis:6379/0
CELERY_BROKER_URL=redis://redis:6379/0
2 changes: 1 addition & 1 deletion .env_local
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PYTHONPATH=/app/safe_transaction_history
PYTHONPATH=/app/safe_transaction_service
C_FORCE_ROOT=true
DEBUG=0
USE_DOCKER=False
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ python:
- "3.7"
env:
global:
- DOCKERHUB_PROJECT=safe-transaction-history
- SOURCE_FOLDER=safe_transaction_history
- DOCKERHUB_PROJECT=safe-transaction-service
- SOURCE_FOLDER=safe_transaction_service
- PIP_USE_MIRRORS=true
- DJANGO_SETTINGS_MODULE=config.settings.test
- DATABASE_URL=psql://postgres@localhost/travisci
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[![Build Status](https://travis-ci.org/gnosis/safe-transaction-history.svg?branch=master)](https://travis-ci.org/gnosis/safe-transaction-history)
[![Coverage Status](https://coveralls.io/repos/github/gnosis/safe-transaction-history/badge.svg?branch=master)](https://coveralls.io/github/gnosis/safe-transaction-history?branch=master)
![Python 3.6](https://img.shields.io/badge/Python-3.6-blue.svg)
![Django 2](https://img.shields.io/badge/Django-2-blue.svg)
[![Build Status](https://travis-ci.org/gnosis/safe-transaction-service.svg?branch=master)](https://travis-ci.org/gnosis/safe-transaction-service)
[![Coverage Status](https://coveralls.io/repos/github/gnosis/safe-transaction-service/badge.svg?branch=master)](https://coveralls.io/github/gnosis/safe-transaction-service?branch=master)
![Python 3.7](https://img.shields.io/badge/Python-3.7-blue.svg)
![Django 2.2](https://img.shields.io/badge/Django-2.2-blue.svg)

# Gnosis Transaction History service
Gnosis Transaction History service
# Gnosis Transaction Service
Gnosis Transaction Service

## Index of contents

- [Docs](#docs)

Docs
------------
You can open the diagrams with [Staruml](http://staruml.io/)
You can open the diagrams under `docs/` with [Staruml](http://staruml.io/)

Contributors
------------
Expand Down
8 changes: 4 additions & 4 deletions config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import environ

ROOT_DIR = environ.Path(__file__) - 3 # (safe_transaction_history/config/settings/base.py - 3 = safe-transaction-history/)
APPS_DIR = ROOT_DIR.path('safe_transaction_history')
ROOT_DIR = environ.Path(__file__) - 3 # (safe_transaction_service/config/settings/base.py - 3 = safe-transaction-service/)
APPS_DIR = ROOT_DIR.path('safe_transaction_service')

env = environ.Env()

Expand Down Expand Up @@ -69,7 +69,7 @@
'drf_yasg',
]
LOCAL_APPS = [
'safe_transaction_history.history.apps.HistoryConfig',
'safe_transaction_service.history.apps.HistoryConfig',
]
# https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
Expand Down Expand Up @@ -174,7 +174,7 @@
# Celery
# ------------------------------------------------------------------------------
INSTALLED_APPS += [
'safe_transaction_history.taskapp.celery.CeleryConfig',
'safe_transaction_service.taskapp.celery.CeleryConfig',
'django_celery_beat',
]
# http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-broker_url
Expand Down
2 changes: 1 addition & 1 deletion config/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
url(r'^swagger(?P<format>\.json|\.yaml)$', schema_view.without_ui(cache_timeout=None), name='schema-json'),
url(r'^redoc/$', schema_view.with_ui('redoc', cache_timeout=None), name='schema-redoc'),
url(settings.ADMIN_URL, admin.site.urls),
url(r'^api/v1/', include('safe_transaction_history.history.urls', namespace='v1')),
url(r'^api/v1/', include('safe_transaction_service.history.urls', namespace='v1')),
url(r'^check/', lambda request: HttpResponse("Ok"), name='check'),
]

Expand Down
4 changes: 2 additions & 2 deletions config/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
from django.core.wsgi import get_wsgi_application

# This allows easy placement of apps within the interior
# safe_transaction_history directory.
# safe_transaction_service directory.
app_path = os.path.abspath(os.path.join(
os.path.dirname(os.path.abspath(__file__)), os.pardir))
sys.path.append(os.path.join(app_path, 'safe_transaction_history'))
sys.path.append(os.path.join(app_path, 'safe_transaction_service'))



Expand Down
2 changes: 1 addition & 1 deletion docker/web/celery/scheduler/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ else
fi

echo "==> Running Celery beat <=="
exec celery beat -A safe_transaction_history.taskapp -S django_celery_beat.schedulers:DatabaseScheduler --loglevel $log_level
exec celery beat -A safe_transaction_service.taskapp -S django_celery_beat.schedulers:DatabaseScheduler --loglevel $log_level
2 changes: 1 addition & 1 deletion docker/web/celery/worker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

set -euo pipefail

celery -A safe_transaction_history.taskapp worker -l INFO
celery -A safe_transaction_service.taskapp worker -l INFO
8 changes: 4 additions & 4 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,17 @@ qthelp:
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/safe_transaction_history.qhcp"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/safe_transaction_service.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/safe_transaction_history.qhc"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/safe_transaction_service.qhc"

devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/safe_transaction_history"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/safe_transaction_history"
@echo "# mkdir -p $$HOME/.local/share/devhelp/safe_transaction_service"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/safe_transaction_service"
@echo "# devhelp"

epub:
Expand Down
8 changes: 4 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
# html_file_suffix = None

# Output file base name for HTML help builder.
htmlhelp_basename = "safe_transaction_historydoc"
htmlhelp_basename = "safe_transaction_servicedoc"


# -- Options for LaTeX output --------------------------------------------------
Expand All @@ -182,7 +182,7 @@
latex_documents = [
(
"index",
"safe_transaction_history.tex",
"safe_transaction_service.tex",
"Gnosis Transaction History Documentation",
"""Gnosis""",
"manual",
Expand Down Expand Up @@ -217,7 +217,7 @@
man_pages = [
(
"index",
"safe_transaction_history",
"safe_transaction_service",
"Gnosis Safe Relay Service Documentation",
["""Gnosis"""],
1,
Expand All @@ -236,7 +236,7 @@
texinfo_documents = [
(
"index",
"safe_transaction_history",
"safe_transaction_service",
"Gnosis Safe Relay Service Documentation",
"""Gnosis""",
"Gnosis Safe Relay Service",
Expand Down
4 changes: 2 additions & 2 deletions manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
raise

# This allows easy placement of apps within the interior
# safe_transaction_history directory.
# safe_transaction_service directory.
current_path = os.path.dirname(os.path.abspath(__file__))
sys.path.append(os.path.join(current_path, 'safe_transaction_history'))
sys.path.append(os.path.join(current_path, 'safe_transaction_service'))

execute_from_command_line(sys.argv)
2 changes: 1 addition & 1 deletion run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ set -euo pipefail

docker-compose build --force-rm
docker-compose create
docker restart safe-transaction-history_db_1 safe-transaction-history_redis_1 safe-transaction-history_ganache_1
docker restart safe-transaction-service_db_1 safe-transaction-service_redis_1 safe-transaction-service_ganache_1
DJANGO_DOT_ENV_FILE=.env_local pytest
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@


class HistoryConfig(AppConfig):
name = 'safe_transaction_history.history'
name = 'safe_transaction_service.history'
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# from rest_framework.test import APITestCase
#
# from safe_transaction_history.ether.tests.factories import get_eth_address_with_key, get_transaction_with_info
# from safe_transaction_service.ether.tests.factories import get_eth_address_with_key, get_transaction_with_info
# from ..serializers import BaseSafeMultisigTransactionSerializer, SafeMultisigHistorySerializer
#
#
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
from rest_framework.response import Response
from rest_framework.views import APIView

from safe_transaction_history.history.models import MultisigTransaction
from safe_transaction_history.version import __version__
from safe_transaction_service.history.models import MultisigTransaction
from safe_transaction_service.version import __version__

from .filters import DefaultPagination
from .serializers import (SafeMultisigHistoryResponseSerializer,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings.local') # pragma: no cover


app = Celery('safe_transaction_history')
app = Celery('safe_transaction_service')


class CeleryConfig(AppConfig):
name = 'safe_transaction_history.taskapp'
name = 'safe_transaction_service.taskapp'
verbose_name = 'Celery Config'

# Use Django logging instead of celery logger
Expand Down
File renamed without changes.

0 comments on commit e7796d4

Please sign in to comment.