Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-branding Sovrin StagingNet to TestNet #213

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -464,14 +464,14 @@ jobs:
cd ci/integration-sovrin && make new && sleep 30
- name: Query indyscan-api
run: |
curl -vv -H "Content-Type: application/json" http://localhost:3708/api/networks/SOVRIN_STAGINGNET/ledgers/domain/txs/5
curl -vv -H "Content-Type: application/json" http://localhost:3708/api/networks/SOVRIN_TESTNET/ledgers/domain/txs/5
exit_status=$?
if [ $exit_status -eq 1 ]; then
exit -1
fi
- name: Query indyscan-webapp
run: |
curl -vv -H "Content-Type: application/json" http://localhost:3707/home/SOVRIN_STAGINGNET
curl -vv -H "Content-Type: application/json" http://localhost:3707/home/SOVRIN_TESTNET
exit_status=$?
if [ $exit_status -eq 1 ]; then
exit -1
Expand Down
10 changes: 5 additions & 5 deletions ci/integration-sovrin/app-config-api/sovrin.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@
}
},
{
"id": "SOVRIN_STAGINGNET",
"id": "SOVRIN_TESTNET",
"ui": {
"priority": 2,
"display": "StagingNet",
"display-long": "Sovrin StagingNet",
"display": "TestNet",
"display-long": "Sovrin TestNet",
"description": "Network for to try out proof of concepts, demos, and other non-production but stable use cases.",
"tutorial": "Get your DID and start writing on the network",
"tutorial-link": "https://selfserve.sovrin.org/",
"tutorial-link": "https://sovrin.org/overview/",
"logo-address": "/static/sovrin.png"
},
"aliases": [
"SOVRIN_TESTNET"
],
"es" : {
"index": "txs-sovstaging"
"index": "txs-sovtest"
}
}
]
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"env": {
"INDY_NETWORK": "SOVRIN_STAGINGNET",
"INDY_NETWORK": "SOVRIN_TESTNET",
"ES_URL": "http://indyscan-elasticsearch.esnet:9200",
"ES_INDEX": "txs-sovstaging"
"ES_INDEX": "txs-sovtest"
},
"workersBuildersTemplate": [
{
Expand Down
2 changes: 1 addition & 1 deletion ci/integration-sovrin/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
- esnet
- indyscan
environment:
- WORKER_CONFIGS=/home/indyscan/indyscan-daemon/app-configs-docker/sovmain.json,/home/indyscan/indyscan-daemon/app-configs-docker/sovstaging.json
- WORKER_CONFIGS=/home/indyscan/indyscan-daemon/app-configs-docker/sovmain.json,/home/indyscan/indyscan-daemon/app-configs-docker/sovtest.json
- LOG_LEVEL=info
- LOG_HTTP_REQUESTS=true
- LOG_HTTP_RESPONSES=true
Expand Down
2 changes: 1 addition & 1 deletion indyscan-api-client/demo/get-many-txs.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { getTxsV2 } = require('../src')

const API_URL = process.env.API_URL || 'https://indyscan.io'
const NETWORK_ID = process.env.NETWORK_ID || 'SOVRIN_STAGINGNET'
const NETWORK_ID = process.env.NETWORK_ID || 'SOVRIN_TESTNET'

async function fetch_1000txs_in_39K_40K_seqNo_range () { // eslint-disable-line
return getTxsV2(
Expand Down
2 changes: 1 addition & 1 deletion indyscan-api-client/test/config/indyscanio.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
API_URL='https://indyscan.io'
NETWORK_ID='SOVRIN_STAGINGNET'
NETWORK_ID='SOVRIN_TESTNET'
2 changes: 1 addition & 1 deletion indyscan-api-client/test/config/localhost.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
API_URL='http://localhost:3708'
NETWORK_ID='SOVRIN_STAGINGNET'
NETWORK_ID='SOVRIN_TESTNET'
10 changes: 5 additions & 5 deletions indyscan-api/app-config/sovrin.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@
}
},
{
"id": "SOVRIN_STAGINGNET",
"id": "SOVRIN_TESTNET",
"ui": {
"priority": 2,
"display": "StagingNet",
"display-long": "Sovrin StagingNet",
"display": "TestNet",
"display-long": "Sovrin TestNet",
"description": "Network for to try out proof of concepts, demos, and other non-production but stable use cases.",
"tutorial": "Get your DID and start writing on the network",
"tutorial-link": "https://selfserve.sovrin.org/",
"logo-address": "/static/sovrin.png"
},
"aliases": [
"sovstaging",
"sovtest",
"SOVRIN_TESTNET"
],
"es" : {
"index": "txs-sovstaging"
"index": "txs-sovtest"
}
},
{
Expand Down
8 changes: 4 additions & 4 deletions indyscan-api/tests/unit/service/service-networks.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ describe('network config manager', () => {
}
},
{
id: 'sovstaging',
id: 'sovtest',
ui: {
priority: 2,
display: 'StagingNet',
description: 'StagingNet is area where end-users of products can test in a pre-production environment.'
display: 'TestNet',
description: 'TestNet is area where end-users of products can test in a pre-production environment.'
},
aliases: [
'SOVRIN_TESTNET'
Expand Down Expand Up @@ -92,7 +92,7 @@ describe('network config manager', () => {
const networks = networkManager.getNetworkConfigs()
expect(networks.length).toBe(3)
expect(networks[0].id).toBe('sovmain')
expect(networks[1].id).toBe('sovstaging')
expect(networks[1].id).toBe('sovtest')
expect(networks[2].id).toBe('sovbuilder')
})

Expand Down
2 changes: 1 addition & 1 deletion indyscan-daemon/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Main properties of daemon are specified by environment variables.

Example:
```
WORKER_CONFIGS=app-configs/sovmain.json,app-configs/sovstaging.json,app-configs/sovbuilder.json
WORKER_CONFIGS=app-configs/sovmain.json,app-configs/sovtest.json,app-configs/sovbuilder.json
LOG_LEVEL=debug
LOG_ES_URL=http://localhost:9200
SERVER_ENABLED=true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"env": {
"INDY_NETWORK": "SOVRIN_STAGINGNET",
"INDY_NETWORK": "SOVRIN_TESTNET",
"ES_URL": "http://localhost:9200",
"ES_INDEX": "txs-sovstaging"
"ES_INDEX": "txs-sovtest"
},
"workersBuildersTemplate": [
{
Expand Down
4 changes: 2 additions & 2 deletions indyscan-daemon/genesis-sovrin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ POOL_DIR="./app-config/genesis"

echo "Downloading genesis files for public Sovrin ledgers."
curl -s https://raw.githubusercontent.com/sovrin-foundation/sovrin/master/sovrin/pool_transactions_live_genesis > "$POOL_DIR"/SOVRIN_MAINNET.txn
curl -s https://raw.githubusercontent.com/sovrin-foundation/sovrin/master/sovrin/pool_transactions_sandbox_genesis > "$POOL_DIR"/SOVRIN_STAGINGNET.txn
curl -s https://raw.githubusercontent.com/sovrin-foundation/sovrin/master/sovrin/pool_transactions_sandbox_genesis > "$POOL_DIR"/SOVRIN_TESTNET.txn
curl -s https://raw.githubusercontent.com/sovrin-foundation/sovrin/master/sovrin/pool_transactions_builder_genesis > "$POOL_DIR"/SOVRIN_BUILDERNET.txn
curl -s https://raw.githubusercontent.com/sovrin-foundation/sovrin/master/sovrin/pool_transactions_training_genesis > "$POOL_DIR"/SOVRIN_TRAININGNET.txn

echo "Main-net network genesis saved to: $POOL_DIR/SOVRIN_MAINNET/SOVRIN_MAINNET.txn"
echo "Staging-net network genesis saved to: $POOL_DIR/SOVRIN_STAGINGNET/SOVRIN_STAGINGNET.txn"
echo "Test-net network genesis saved to: $POOL_DIR/SOVRIN_TESTNET/SOVRIN_TESTNET.txn"
echo "Builder-net network genesis saved to: $POOL_DIR/SOVRIN_BUILDERNET/SOVRIN_BUILDERNET.txn"
echo "Training-net network genesis saved to: $POOL_DIR/SOVRIN_TRAININGNET/SOVRIN_TRAININGNET.txn"
6 changes: 3 additions & 3 deletions indyscan-daemon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"lint": "standard",
"lint:fix": "standard --fix",
"dev": "cross-env NODE_ENV=development nodemon src/index.js",
"dev:sovrin:staging:builder": "cross-env NODE_ENV=development WORKER_CONFIGS=app-configs/sovstaging.json,app-configs/sovbuilder.json nodemon src/index.js",
"dev:sovrin:test:builder": "cross-env NODE_ENV=development WORKER_CONFIGS=app-configs/sovtest.json,app-configs/sovbuilder.json nodemon src/index.js",
"dev:sovrin:builder": "cross-env NODE_ENV=development WORKER_CONFIGS=app-configs/sovbuilder.json nodemon src/index.js",
"dev:sovrin:staging": "cross-env NODE_ENV=development WORKER_CONFIGS=app-configs/sovstaging.json nodemon src/index.js",
"dev:sovrin:test": "cross-env NODE_ENV=development WORKER_CONFIGS=app-configs/sovtest.json nodemon src/index.js",
"dev:sovrin:sovmain": "cross-env NODE_ENV=development WORKER_CONFIGS=app-configs/sovmain.json nodemon src/index.js",
"dev:sovrin": "cross-env NODE_ENV=development WORKER_CONFIGS=app-configs/sovmain.json,app-configs/sovstaging.json,app-configs/sovbuilder.json nodemon src/index.js",
"dev:sovrin": "cross-env NODE_ENV=development WORKER_CONFIGS=app-configs/sovmain.json,app-configs/sovtest.json,app-configs/sovbuilder.json nodemon src/index.js",
"start": "cross-env NODE_ENV=production node ./src/index.js",
"start:locahost": "cross-env ENVIRONMENT=localhost node ./src/index.js",
"test:unit": "jest test/unit",
Expand Down
2 changes: 1 addition & 1 deletion indyscan-daemon/sovrin.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
WORKER_CONFIGS=app-configs/sovmain.json,app-configs/sovstaging.json,app-configs/sovbuilder.json
WORKER_CONFIGS=app-configs/sovmain.json,app-configs/sovtest.json,app-configs/sovbuilder.json
LOG_LEVEL=debug
LOG_HTTP_REQUESTS=true
LOG_HTTP_RESPONSES=true
Expand Down
8 changes: 4 additions & 4 deletions start/app-config-api/sovrin.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
}
},
{
"id": "SOVRIN_STAGINGNET",
"id": "SOVRIN_TESTNET",
"ui": {
"priority": 2,
"display": "StagingNet",
"display-long": "Sovrin StagingNet",
"display": "TestNet",
"display-long": "Sovrin TestNet",
"description": "Network for to try out proof of concepts, demos, and other non-production but stable use cases.",
"tutorial": "Get your DID and start writing on the network",
"tutorial-link": "https://selfserve.sovrin.org/",
Expand All @@ -30,7 +30,7 @@
"SOVRIN_TESTNET"
],
"es" : {
"index": "txs-sovstaging"
"index": "txs-sovtest"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"env": {
"INDY_NETWORK": "SOVRIN_STAGINGNET",
"INDY_NETWORK": "SOVRIN_TESTNET",
"ES_URL": "http://indyscan-elasticsearch.esnet:9200",
"ES_INDEX": "txs-sovstaging"
"ES_INDEX": "txs-sovtest"
},
"workersBuildersTemplate": [
{
Expand Down