From 7274fb017dab722f8678f7373e66e0df05312ee3 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Thu, 9 Jan 2025 14:03:56 -0300 Subject: [PATCH] Drop old ipfs stuff --- launch_ipfs.sh | 36 ------------------------------------ skynet.toml.example | 2 -- skynet/cli.py | 25 ------------------------- 3 files changed, 63 deletions(-) delete mode 100755 launch_ipfs.sh diff --git a/launch_ipfs.sh b/launch_ipfs.sh deleted file mode 100755 index 47032da..0000000 --- a/launch_ipfs.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -name='skynet-ipfs' -peers=("$@") - -data_dir="$(pwd)/ipfs-docker-data" -data_target='/data/ipfs' - -# Create data directory if it doesn't exist -mkdir -p "$data_dir" - -# Run the container -docker run -d \ - --name "$name" \ - -p 8080:8080/tcp \ - -p 4001:4001/tcp \ - -p 127.0.0.1:5001:5001/tcp \ - --mount type=bind,source="$data_dir",target="$data_target" \ - --rm \ - ipfs/go-ipfs:latest - -# Change ownership -docker exec "$name" chown 1000:1000 -R "$data_target" - -# Wait for Daemon to be ready -while read -r log; do - echo "$log" - if [[ "$log" == *"Daemon is ready"* ]]; then - break - fi -done < <(docker logs -f "$name") - -# Connect to peers -for peer in "${peers[@]}"; do - docker exec "$name" ipfs swarm connect "$peer" || echo "Error connecting to peer: $peer" -done diff --git a/skynet.toml.example b/skynet.toml.example index 97423e3..a075a30 100644 --- a/skynet.toml.example +++ b/skynet.toml.example @@ -21,7 +21,6 @@ permission = 'active' key = '5Xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' node_url = 'https://testnet.skygpu.net' hyperion_url = 'https://testnet.skygpu.net' -ipfs_gateway_url = '/ip4/169.197.140.154/tcp/4001/p2p/12D3KooWKWogLFNEcNNMKnzU7Snrnuj84RZdMBg3sLiQSQc51oEv' ipfs_url = 'http://127.0.0.1:5001' token = 'XXXXXXXXXX:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' @@ -31,7 +30,6 @@ permission = 'active' key = '5Xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' node_url = 'https://testnet.skygpu.net' hyperion_url = 'https://testnet.skygpu.net' -ipfs_gateway_url = '/ip4/169.197.140.154/tcp/4001/p2p/12D3KooWKWogLFNEcNNMKnzU7Snrnuj84RZdMBg3sLiQSQc51oEv' ipfs_url = 'http://127.0.0.1:5001' token = 'XXXXXXXXXX:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' diff --git a/skynet/cli.py b/skynet/cli.py index 18ec273..6c82774 100755 --- a/skynet/cli.py +++ b/skynet/cli.py @@ -383,12 +383,6 @@ def telegram( node_url = load_key(config, 'skynet.telegram.node_url') hyperion_url = load_key(config, 'skynet.telegram.hyperion_url') - try: - ipfs_gateway_url = load_key(config, 'skynet.telegram.ipfs_gateway_url') - - except ConfigParsingError: - ipfs_gateway_url = None - ipfs_url = load_key(config, 'skynet.telegram.ipfs_url') try: @@ -412,7 +406,6 @@ def telegram( hyperion_url, db_host, db_user, db_pass, ipfs_url, - remote_ipfs_node=ipfs_gateway_url, key=key, explorer_domain=explorer_domain, ipfs_domain=ipfs_domain @@ -453,12 +446,6 @@ def discord( node_url = load_key(config, 'skynet.discord.node_url') hyperion_url = load_key(config, 'skynet.discord.hyperion_url') - try: - ipfs_gateway_url = load_key(config, 'skynet.discord.ipfs_gateway_url') - - except ConfigParsingError: - ipfs_gateway_url = None - ipfs_url = load_key(config, 'skynet.discord.ipfs_url') try: @@ -482,7 +469,6 @@ def discord( hyperion_url, db_host, db_user, db_pass, ipfs_url, - remote_ipfs_node=ipfs_gateway_url, key=key, explorer_domain=explorer_domain, ipfs_domain=ipfs_domain @@ -494,17 +480,6 @@ def discord( asyncio.run(_async_main()) -@run.command() -@click.option('--loglevel', '-l', default='INFO', help='logging level') -@click.option('--name', '-n', default='skynet-ipfs', help='container name') -@click.option('--peer', '-p', default=(), help='connect to peer', multiple=True, type=str) -def ipfs(loglevel, name, peer): - from skynet.ipfs.docker import open_ipfs_node - - logging.basicConfig(level=loglevel) - with open_ipfs_node(name=name, peers=peer): - ... - @run.command() @click.option('--loglevel', '-l', default='INFO', help='logging level') def pinner(loglevel):