Ver Fonte

bin/darkirc: fix test script

Dastan-glitch há 3 anos atrás
pai
commit
5dfd0db928

+ 7 - 7
bin/darkirc/script/tmux_session/ircd_full_node1.toml

@@ -1,8 +1,8 @@
 ## JSON-RPC listen URL
 ## JSON-RPC listen URL
-rpc_listen="tcp://127.0.0.1:8890"
+rpc_listen = "tcp://127.0.0.1:8890"
 
 
 ## IRC listen URL
 ## IRC listen URL
-irc_listen="tcp://127.0.0.1:22022"
+irc_listen = "tcp://127.0.0.1:22022"
 
 
 ## List of channels to autojoin for new client connections
 ## List of channels to autojoin for new client connections
 autojoin = ["#dev", "#test"]
 autojoin = ["#dev", "#test"]
@@ -10,11 +10,11 @@ autojoin = ["#dev", "#test"]
 ## P2P net settings
 ## P2P net settings
 [net]
 [net]
 ## Connection slots
 ## Connection slots
-outbound_connections=0
+outbound_connections = 0
 
 
 inbound = ["tcp://127.0.0.1:25552"]
 inbound = ["tcp://127.0.0.1:25552"]
 
 
-external_addr = ["tcp://127.0.0.1:25552"]
+external_addrs = ["tcp://127.0.0.1:25552"]
 
 
 # peers = []
 # peers = []
 
 
@@ -22,7 +22,7 @@ external_addr = ["tcp://127.0.0.1:25552"]
 seeds = ["tcp://127.0.0.1:25551"]
 seeds = ["tcp://127.0.0.1:25551"]
 
 
 # Prefered transports for outbound connections
 # Prefered transports for outbound connections
-outbound_transports = ["tcp"]
+allowed_transports = ["tcp"]
 
 
 localnet = true
 localnet = true
 #
 #
@@ -32,8 +32,8 @@ localnet = true
 [channel."#test"]
 [channel."#test"]
 secret = "HoLfk8vXBvNsBZ73e2xRPBZ9vEbnF9FVi4fDdyU9AZLU"
 secret = "HoLfk8vXBvNsBZ73e2xRPBZ9vEbnF9FVi4fDdyU9AZLU"
 
 
-[private_key."FCFYzvZ98gAncGNadFp35pTAJSuoJKZFddsi12PnREwp"]
+[secret_key."FCFYzvZ98gAncGNadFp35pTAJSuoJKZFddsi12PnREwp"]
 
 
 [contact."node2"]
 [contact."node2"]
 ## contact public key
 ## contact public key
-contact_pubkey = "D6UzKA6qCG5Mep16i6pJYkUCQcnp46E1jPBsUhyJiXhb"
+public_key = "D6UzKA6qCG5Mep16i6pJYkUCQcnp46E1jPBsUhyJiXhb"

+ 7 - 7
bin/darkirc/script/tmux_session/ircd_full_node2.toml

@@ -1,8 +1,8 @@
 ## JSON-RPC listen URL
 ## JSON-RPC listen URL
-rpc_listen="tcp://127.0.0.1:8891"
+rpc_listen = "tcp://127.0.0.1:8891"
 
 
 ## IRC listen URL
 ## IRC listen URL
-irc_listen="tcp://127.0.0.1:22023"
+irc_listen = "tcp://127.0.0.1:22023"
 
 
 ## List of channels to autojoin for new client connections
 ## List of channels to autojoin for new client connections
 autojoin = ["#dev", "#test"]
 autojoin = ["#dev", "#test"]
@@ -10,11 +10,11 @@ autojoin = ["#dev", "#test"]
 ## P2P net settings
 ## P2P net settings
 [net]
 [net]
 ## Connection slots
 ## Connection slots
-outbound_connections=3
+outbound_connections = 3
 
 
 inbound = ["tcp://127.0.0.1:25553"]
 inbound = ["tcp://127.0.0.1:25553"]
 
 
-external_addr = ["tcp://127.0.0.1:25553"]
+external_addrs = ["tcp://127.0.0.1:25553"]
 
 
 # peers = ["tcp://127.0.0.1:25552"]
 # peers = ["tcp://127.0.0.1:25552"]
 
 
@@ -22,7 +22,7 @@ external_addr = ["tcp://127.0.0.1:25553"]
 seeds = ["tcp://127.0.0.1:25551"]
 seeds = ["tcp://127.0.0.1:25551"]
 
 
 # Prefered transports for outbound connections
 # Prefered transports for outbound connections
-outbound_transports = ["tcp"]
+allowed_transports = ["tcp"]
 
 
 localnet = true
 localnet = true
 #
 #
@@ -32,8 +32,8 @@ localnet = true
 [channel."#test"]
 [channel."#test"]
 secret = "HoLfk8vXBvNsBZ73e2xRPBZ9vEbnF9FVi4fDdyU9AZLU"
 secret = "HoLfk8vXBvNsBZ73e2xRPBZ9vEbnF9FVi4fDdyU9AZLU"
 
 
-[private_key."GnS3vqKQtCnbJJcFMsUfTJc7w3B1E49MgZ8jKiksumYh"]
+[secret_key."GnS3vqKQtCnbJJcFMsUfTJc7w3B1E49MgZ8jKiksumYh"]
 
 
 [contact."node1"]
 [contact."node1"]
 ## contact public key
 ## contact public key
-contact_pubkey = "9sfMEVLphJ4dTX3SEvm6NBhTbWDqfsxu7R2bo88CtV8g"
+public_key = "9sfMEVLphJ4dTX3SEvm6NBhTbWDqfsxu7R2bo88CtV8g"

+ 5 - 5
bin/darkirc/script/tmux_session/ircd_full_node3.toml

@@ -1,8 +1,8 @@
 ## JSON-RPC listen URL
 ## JSON-RPC listen URL
-rpc_listen="tcp://127.0.0.1:8892"
+rpc_listen = "tcp://127.0.0.1:8892"
 
 
 ## IRC listen URL
 ## IRC listen URL
-irc_listen="tcp://127.0.0.1:22024"
+irc_listen = "tcp://127.0.0.1:22024"
 
 
 ## List of channels to autojoin for new client connections
 ## List of channels to autojoin for new client connections
 autojoin = ["#dev", "#test"]
 autojoin = ["#dev", "#test"]
@@ -10,11 +10,11 @@ autojoin = ["#dev", "#test"]
 ## P2P net settings
 ## P2P net settings
 [net]
 [net]
 ## Connection slots
 ## Connection slots
-outbound_connections=3
+outbound_connections = 3
 
 
 inbound = ["tcp://127.0.0.1:25554"]
 inbound = ["tcp://127.0.0.1:25554"]
 
 
-external_addr = ["tcp://127.0.0.1:25554"]
+external_addrs = ["tcp://127.0.0.1:25554"]
 
 
 # peers = ["tcp://127.0.0.1:25552"]
 # peers = ["tcp://127.0.0.1:25552"]
 
 
@@ -22,7 +22,7 @@ external_addr = ["tcp://127.0.0.1:25554"]
 seeds = ["tcp://127.0.0.1:25551"]
 seeds = ["tcp://127.0.0.1:25551"]
 
 
 # Prefered transports for outbound connections
 # Prefered transports for outbound connections
-outbound_transports = ["tcp"]
+allowed_transports = ["tcp"]
 
 
 localnet = true
 localnet = true
 #
 #

+ 5 - 5
bin/darkirc/script/tmux_session/ircd_full_node4.toml

@@ -1,8 +1,8 @@
 ## JSON-RPC listen URL
 ## JSON-RPC listen URL
-rpc_listen="tcp://127.0.0.1:8893"
+rpc_listen = "tcp://127.0.0.1:8893"
 
 
 ## IRC listen URL
 ## IRC listen URL
-irc_listen="tcp://127.0.0.1:22025"
+irc_listen = "tcp://127.0.0.1:22025"
 
 
 ## List of channels to autojoin for new client connections
 ## List of channels to autojoin for new client connections
 autojoin = ["#dev", "#test"]
 autojoin = ["#dev", "#test"]
@@ -10,11 +10,11 @@ autojoin = ["#dev", "#test"]
 ## P2P net settings
 ## P2P net settings
 [net]
 [net]
 ## Connection slots
 ## Connection slots
-outbound_connections=3
+outbound_connections = 3
 
 
 inbound = ["tcp://127.0.0.1:25555"]
 inbound = ["tcp://127.0.0.1:25555"]
 
 
-external_addr = ["tcp://127.0.0.1:25555"]
+external_addrs = ["tcp://127.0.0.1:25555"]
 
 
 # peers = ["tcp://127.0.0.1:25554"]
 # peers = ["tcp://127.0.0.1:25554"]
 
 
@@ -22,7 +22,7 @@ external_addr = ["tcp://127.0.0.1:25555"]
 seeds = ["tcp://127.0.0.1:25551"]
 seeds = ["tcp://127.0.0.1:25551"]
 
 
 # Prefered transports for outbound connections
 # Prefered transports for outbound connections
-outbound_transports = ["tcp"]
+allowed_transports = ["tcp"]
 
 
 localnet = true
 localnet = true
 #
 #

+ 4 - 4
bin/darkirc/script/tmux_session/tmux_sessions.sh

@@ -17,14 +17,14 @@ tmux send-keys "../../../../darkirc --config ircd_full_node4.toml" Enter
 
 
 if [ -z "$1" ]; then
 if [ -z "$1" ]; then
 	tmux new-window -t "darkirc:1" -n "weechat"
 	tmux new-window -t "darkirc:1" -n "weechat"
-	tmux send-keys "weechat -t -r '/server add ircd_a 127.0.0.1/22022;/connect ircd_a;/nick Alice'" Enter
+	tmux send-keys "weechat -t -r '/server add ircd_a 127.0.0.1/22022 -notls;/connect ircd_a;/nick Alice'" Enter
 	tmux split-window -v
 	tmux split-window -v
-	tmux send-keys "weechat -t -r '/server add ircd_b 127.0.0.1/22023;/connect ircd_b;/nick Bob'" Enter
+	tmux send-keys "weechat -t -r '/server add ircd_b 127.0.0.1/22023 -notls;/connect ircd_b;/nick Bob'" Enter
 	tmux split-window -h
 	tmux split-window -h
-	tmux send-keys "weechat -t -r '/server add ircd_c 127.0.0.1/22024;/connect ircd_c;/nick Charlie'" Enter
+	tmux send-keys "weechat -t -r '/server add ircd_c 127.0.0.1/22024 -notls;/connect ircd_c;/nick Charlie'" Enter
 	tmux select-pane -t 0
 	tmux select-pane -t 0
 	tmux split-window -h
 	tmux split-window -h
-	tmux send-keys "weechat -t -r '/server add ircd_d 127.0.0.1/22025;/connect ircd_d;/nick Dave'" Enter
+	tmux send-keys "weechat -t -r '/server add ircd_d 127.0.0.1/22025 -notls;/connect ircd_d;/nick Dave'" Enter
 fi
 fi
 
 
 tmux attach
 tmux attach