Skip to content

Commit b3f611a

Browse files
committed
Merge branch 'tlg/legacy-refresh' into 'develop'
Refresh Legacy Workflows See merge request polycentric/polycentric!484
2 parents c13349b + d5c4633 commit b3f611a

14 files changed

Lines changed: 36 additions & 71 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,3 @@ dist
4141
# Generated files
4242
docker-compose.live*
4343
.env
44-
state

.prettierignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
LICENSE
12
coverage
23
public
34
dist
@@ -16,5 +17,3 @@ packages/rs-core
1617
packages/rs-core-wasm-browser
1718
packages/rs-core-wasm-node
1819
legacy
19-
services/polycentric-server
20-
services/verifiers-server

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ members = [
77
"services/server/migration",
88
"services/server/tests",
99
]
10+
exclude = ["legacy/"]
1011
resolver = "2"

README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@
1717
1818
You will need [just](https://github.com/casey/just), Docker, and pnpm.
1919

20-
1. **Run the local server:** `just services/start`
21-
2. **Build rs-core for all platforms:** `just packages/rs-core/build-all`
22-
3. **Install dependencies:** `pnpm install`
23-
4. **Run the app:** `pnpm run:ios` or `pnpm run:android`
20+
1. **Build rs-core for all platforms:** `just packages/rs-core/build-all`
21+
2. **Install dependencies:** `pnpm install`
22+
3. **Run the app:** `pnpm:run web`, `pnpm run:ios`, or `pnpm run:android`
2423

2524
## Development
2625

2726
- `pnpm dev` builds all SDKs in watch mode.
28-
- `just legacy/test-core` runs integration test on local server
2927

3028
## Project Structure
3129

@@ -51,5 +49,6 @@ You will need [just](https://github.com/casey/just), Docker, and pnpm.
5149

5250
| Service | Description |
5351
|---------|-------------|
54-
| `services/polycentric-server` | Reference server implementation for hosting Polycentric instances |
55-
| `services/verifiers-server` | Server for verifying claims and signatures in the protocol |
52+
| `services/server` | Polycentric server |
53+
| `legacy/services/polycentric-server` | Legacy server |
54+
| `legacy/services/verifiers-server` | Legacy Server for verifying claims and signatures in the protocol |

compose.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ services:
3333
retries: 30
3434
start_period: 15s
3535

36-
polycentric-server:
36+
legacy-server:
3737
build:
3838
context: .
39-
dockerfile: services/polycentric-server/Dockerfile
39+
dockerfile: legacy/services/polycentric-server/Dockerfile
4040
ports:
4141
- '127.0.0.1:${POLYCENTRIC_PORT:-8787}:8787'
4242
environment:
@@ -52,15 +52,15 @@ services:
5252
opensearch:
5353
condition: service_healthy
5454

55-
polycentric-verifiers:
56-
build: ./services/verifiers-server
57-
working_dir: /app/services/verifiers-server
55+
legacy-verifiers:
56+
build: ./legacy/services/verifiers-server
57+
working_dir: /app/legacy/services/verifiers-server
5858
volumes:
59-
- ../:/app
59+
- .:/app
6060
ports:
6161
- '127.0.0.1:${VERIFIERS_PORT:-3002}:3002'
6262
environment:
63-
- SERVER_URL=http://polycentric-server:8787
63+
- SERVER_URL=http://legacy-server:8787
6464
command: sh -c "npm install && npx nodemon src/app.ts"
6565
depends_on:
6666
postgres:

legacy/packages/polycentric-core/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Shared client library used by:
44

5-
- `services/verifiers-server` (backend that verifies platform claims)
5+
- `legacy/services/verifiers-server` (backend that verifies platform claims)
66
- `legacy/packages/polycentric-web` and `legacy/packages/polycentric-react` (the legacy Polycentric web client and its React component layer)
77

88
## Tests

legacy/packages/polycentric-core/scripts/generate-proto.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
set -euo pipefail
33

44
DIR="$(cd "$(dirname "$0")/.." && pwd)"
5-
PROTO_DIR="$DIR/../../../protos"
5+
PROTO_DIR="$DIR/../../../legacy/protos"
66

77
protoc \
88
--ts_proto_opt=esModuleInterop=true \
99
--ts_proto_opt=forceLong=long \
1010
--ts_proto_out="$DIR/src" \
1111
--experimental_allow_proto3_optional \
1212
-I"$PROTO_DIR" \
13-
"$PROTO_DIR/server-polycentric.proto"
13+
"$PROTO_DIR/legacy-polycentric.proto"
1414

15-
mv "$DIR/src/server-polycentric.ts" "$DIR/src/protocol.ts"
15+
mv "$DIR/src/legacy-polycentric.ts" "$DIR/src/protocol.ts"

legacy/services/README.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

legacy/services/justfile

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,9 @@
11
_default:
22
@just --list
33

4-
# Start services without building
5-
up:
6-
docker compose up
7-
8-
# Build and start services
9-
start:
10-
docker compose up --build
11-
12-
# Build images
13-
build:
14-
docker compose build
15-
16-
# Stop services
17-
down:
18-
docker compose down
19-
20-
# Stop services and delete verifiers state
214
clean:
22-
docker compose down
235
rm -rf verifiers-server/state
246

257
# Run server tests inside container
268
test:
27-
docker compose exec polycentric-server cargo test --manifest-path services/polycentric-server/Cargo.toml
9+
docker compose -f ../../compose.yml exec legacy-server cargo test

0 commit comments

Comments
 (0)