Skip to content

Commit 9a867e1

Browse files
author
swapper-phoenix
committed
Change swapper to nodechain
1 parent d4d80ad commit 9a867e1

File tree

17 files changed

+27
-31
lines changed

17 files changed

+27
-31
lines changed

Connector/tests/docker-compose/btc.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
version: "3"
22
services:
33
bitcoincore:
4-
build: ../../../packages/swapper-bitcoin-core
4+
build: ../../../packages/nodechain-bitcoin-core
55
image: bitcoincore
6-
command:
7-
-rpcuser=swapper
6+
command: -rpcuser=swapper
87
-rpcpassword=swapper
98
-server=1
109
-rpcallowip=0.0.0.0/0
@@ -34,7 +33,7 @@ services:
3433
- ${BLOCKCHAIN_PATH}/electrumx:/data
3534

3635
electrum:
37-
build: ../../../packages/swapper-electrum-regtest
36+
build: ../../../packages/nodechain-electrum-regtest
3837
image: electrum
3938
environment:
4039
TESTNET: 1
@@ -49,4 +48,4 @@ services:
4948
PORT: ${PORT}
5049
image: connector
5150
ports:
52-
- ${PORT}:80
51+
- ${PORT}:80

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ See deployment for notes on how to deploy the project on a live system.
6060
- Choose a port where you want to bind SSL port.
6161
- Choose if you want to add SSL to your node.
6262

63-
_(To activate SSL note that you need to have the files `swapper_cert.key` and `swapper_cert.crt` in the certificates directory)_
63+
_(To activate SSL note that you need to have the files `nodechain_cert.key` and `nodechain_cert.crt` in the certificates directory)_
6464

6565
### Flags
6666

@@ -109,7 +109,6 @@ This environment is intended for real cases. You will be able to interact with a
109109

110110
## Test
111111

112-
113112
We use [Flake8](https://flake8.pycqa.org/en/latest/) for linting and [PyTest](https://docs.pytest.org/en/6.2.x/) for testing.
114113

115114
### Lint
@@ -151,9 +150,9 @@ You can do the local testing manually:
151150
1. Lint the project using the instructions above.
152151

153152
2. Use the `scripts/buildapi.py` script to launch NodeChain in development network locally and select the token you want to test
154-
155-
3. Run tests inside the Connector docker image with the following command where you have to replace ${TOKEN} by the token symbol you are testing in lower case
156-
153+
154+
3. Run tests inside the Connector docker image with the following command where you have to replace ${TOKEN} by the token symbol you are testing in lower case
155+
157156
```sh
158157
docker exec -it ${TOKEN}_development_api_connector_1 bash -c "cd Connector && python -m pytest -c tests/${TOKEN}/pytest_${TOKEN}.ini -s --cov=${TOKEN}/ --cov=logger/ --cov=rpcutils/ --cov=wsutils/ tests/${TOKEN}"
159158
```
@@ -171,7 +170,6 @@ Follow the steps for CircleCI remote testing
171170

172171
_**Note**: When running test remotely, CircleCI will execute all the jobs defined in the `.circleci/config.yml`_
173172

174-
175173
## Contributing
176174

177175
Please read [Contribution Guidelines](https://github.com/swapper-org/NodeChain/blob/master/CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests to us.

docker-compose/development/btc.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
version: "3"
22
services:
33
bitcoincore:
4-
build: ../../packages/swapper-bitcoin-core
4+
build: ../../packages/nodechain-bitcoin-core
55
image: bitcoincore
6-
command:
7-
-rpcuser=swapper
6+
command: -rpcuser=swapper
87
-rpcpassword=swapper
98
-server=1
109
-rpcallowip=0.0.0.0/0
@@ -32,7 +31,7 @@ services:
3231
- ${BLOCKCHAIN_PATH}/electrumx:/data
3332

3433
electrum:
35-
build: ../../packages/swapper-electrum-regtest
34+
build: ../../packages/nodechain-electrum-regtest
3635
image: electrum
3736
environment:
3837
TESTNET: 1
@@ -52,4 +51,4 @@ services:
5251
- ${CERT_PATH}:/etc/nginx/certs
5352
ports:
5453
- ${PORT}:80
55-
- ${SSL_PORT}:443
54+
- ${SSL_PORT}:443

docker-compose/mainnet/bch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
- ${BLOCKCHAIN_PATH}/electrumx:/data
2020

2121
electrum:
22-
build: ../../packages/swapper-electron-cash
22+
build: ../../packages/nodechain-electron-cash
2323
image: electrum
2424

2525
connector:

docker-compose/mainnet/btc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3"
22
services:
33
bitcoincore:
4-
build: ../../packages/swapper-bitcoin-core
4+
build: ../../packages/nodechain-bitcoin-core
55
image: bitcoincore
66
command: -rpcuser=swapper -rpcpassword=swapper -server=1 -rpcallowip=0.0.0.0/0 -rpcbind=bitcoincore -txindex=1 -rpcport=8332
77
volumes:
@@ -20,7 +20,7 @@ services:
2020
- ${BLOCKCHAIN_PATH}/electrumx:/data
2121

2222
electrum:
23-
build: ../../packages/swapper-electrum
23+
build: ../../packages/nodechain-electrum
2424
image: electrum
2525

2626
connector:

docker-compose/testnet/bch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
- ${BLOCKCHAIN_PATH}/electrumx:/data
2121

2222
electrum:
23-
build: ../../packages/swapper-electron-cash
23+
build: ../../packages/nodechain-electron-cash
2424
image: electrum
2525
environment:
2626
TESTNET: 1

docker-compose/testnet/btc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3"
22
services:
33
bitcoincore:
4-
build: ../../packages/swapper-bitcoin-core
4+
build: ../../packages/nodechain-bitcoin-core
55
image: bitcoincore
66
command: -rpcuser=swapper -rpcpassword=swapper -server=1 -rpcallowip=0.0.0.0/0 -rpcbind=bitcoincore -txindex=1 -testnet -rpcport=8332
77
volumes:
@@ -21,7 +21,7 @@ services:
2121
- ${BLOCKCHAIN_PATH}/electrumx:/data
2222

2323
electrum:
24-
build: ../../packages/swapper-electrum
24+
build: ../../packages/nodechain-electrum
2525
image: electrum
2626
environment:
2727
TESTNET: 1

nginx/ssl.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ http {
1717
}
1818

1919
listen 443 ssl;
20-
ssl_certificate /etc/nginx/certs/swapper_cert.crt;
21-
ssl_certificate_key /etc/nginx/certs/swapper_cert.key;
20+
ssl_certificate /etc/nginx/certs/nodechain_cert.crt;
21+
ssl_certificate_key /etc/nginx/certs/nodechain_cert.key;
2222
}
2323
}

0 commit comments

Comments
 (0)