Browse Source

update ports from 466* to 266* (#104)

* updates ports from 466* to 266*

* missed a port
pull/1943/head
Zach 7 years ago
committed by Anton Kaliaev
parent
commit
47256cfda2
15 changed files with 54 additions and 54 deletions
  1. +2
    -2
      mintnet-kubernetes/README.rst
  2. +5
    -5
      mintnet-kubernetes/app.template.yaml
  3. +5
    -5
      mintnet-kubernetes/examples/basecoin/app.yaml
  4. +3
    -3
      mintnet-kubernetes/examples/basecoin/lightclient.md
  5. +5
    -5
      mintnet-kubernetes/examples/counter/app.yaml
  6. +5
    -5
      mintnet-kubernetes/examples/dummy/app.yaml
  7. +2
    -2
      mintnet-kubernetes/examples/dummy/tm-monitor-pod.yaml
  8. +1
    -1
      mintnet-kubernetes/examples/dummy/transacter-pod.yaml
  9. +3
    -3
      tm-bench/README.md
  10. +1
    -1
      tm-bench/main.go
  11. +15
    -15
      tm-monitor/README.md
  12. +4
    -4
      tm-monitor/main.go
  13. +1
    -1
      tm-monitor/monitor/monitor_test.go
  14. +1
    -1
      tm-monitor/monitor/node_test.go
  15. +1
    -1
      transact/transact.go

+ 2
- 2
mintnet-kubernetes/README.rst View File

@ -57,7 +57,7 @@ finally, use our `Rest API <../specification/rpc.html>`__ to fetch the status of
Note we are using ``kubectl exec`` because pods are not exposed (and should not be) to the Note we are using ``kubectl exec`` because pods are not exposed (and should not be) to the
outer network: outer network:
``kubectl exec -c tm tm-0 -- curl -s http://tm-1.basecoin:46657/status | json_pp``
``kubectl exec -c tm tm-0 -- curl -s http://tm-1.basecoin:26657/status | json_pp``
**Using the dashboard:** **Using the dashboard:**
@ -223,7 +223,7 @@ Status of the second pod's Tendermint app:
:: ::
kubectl exec -c tm tm-0 -- curl -s http://tm-1.<YOUR_APP_NAME>:46657/status | json_pp
kubectl exec -c tm tm-0 -- curl -s http://tm-1.<YOUR_APP_NAME>:26657/status | json_pp
Security Security
-------- --------


+ 5
- 5
mintnet-kubernetes/app.template.yaml View File

@ -9,9 +9,9 @@ metadata:
app: YOUR_APP_NAME app: YOUR_APP_NAME
spec: spec:
ports: ports:
- port: 46656
- port: 26656
name: p2p name: p2p
- port: 46657
- port: 26657
name: rpc name: rpc
clusterIP: None clusterIP: None
selector: selector:
@ -91,9 +91,9 @@ spec:
cpu: 100m cpu: 100m
memory: 256Mi memory: 256Mi
ports: ports:
- containerPort: 46656
- containerPort: 26656
name: p2p name: p2p
- containerPort: 46657
- containerPort: 26657
name: rpc name: rpc
env: env:
- name: SEEDS - name: SEEDS
@ -148,7 +148,7 @@ spec:
IFS=',' read -ra SEEDS_ARR <<< "$SEEDS" IFS=',' read -ra SEEDS_ARR <<< "$SEEDS"
seeds=() seeds=()
for s in "${SEEDS_ARR[@]}"; do for s in "${SEEDS_ARR[@]}"; do
seeds+=("$s.$fqdn_suffix:46656")
seeds+=("$s.$fqdn_suffix:26656")
done done
seeds=$(IFS=','; echo "${seeds[*]}") seeds=$(IFS=','; echo "${seeds[*]}")


+ 5
- 5
mintnet-kubernetes/examples/basecoin/app.yaml View File

@ -9,9 +9,9 @@ metadata:
app: basecoin app: basecoin
spec: spec:
ports: ports:
- port: 46656
- port: 26656
name: p2p name: p2p
- port: 46657
- port: 26657
name: rpc name: rpc
clusterIP: None clusterIP: None
selector: selector:
@ -150,9 +150,9 @@ spec:
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
image: tendermint/tendermint:0.10.0 image: tendermint/tendermint:0.10.0
ports: ports:
- containerPort: 46656
- containerPort: 26656
name: p2p name: p2p
- containerPort: 46657
- containerPort: 26657
name: rpc name: rpc
env: env:
- name: SEEDS - name: SEEDS
@ -207,7 +207,7 @@ spec:
IFS=',' read -ra SEEDS_ARR <<< "$SEEDS" IFS=',' read -ra SEEDS_ARR <<< "$SEEDS"
seeds=() seeds=()
for s in "${SEEDS_ARR[@]}"; do for s in "${SEEDS_ARR[@]}"; do
seeds+=("$s.$fqdn_suffix:46656")
seeds+=("$s.$fqdn_suffix:26656")
done done
seeds=$(IFS=','; echo "${seeds[*]}") seeds=$(IFS=','; echo "${seeds[*]}")


+ 3
- 3
mintnet-kubernetes/examples/basecoin/lightclient.md View File

@ -15,7 +15,7 @@ with a bit of cash....
### Tendermint Chain ID ### Tendermint Chain ID
`kubectl exec -c tm tm-0 -- curl -s http://tm-1.basecoin:46657/status | json_pp | grep network`
`kubectl exec -c tm tm-0 -- curl -s http://tm-1.basecoin:26657/status | json_pp | grep network`
set TM_CHAIN with the value there set TM_CHAIN with the value there
@ -29,13 +29,13 @@ set BC_CHAIN with the value there
We need to be able to reach the tendermint rpc interface from our shell. We need to be able to reach the tendermint rpc interface from our shell.
`kubectl port-forward tm-0 46657:46657`
`kubectl port-forward tm-0 26657:26657`
### Start basecoin-proxy ### Start basecoin-proxy
Using this info, let's connect our proxy and get going Using this info, let's connect our proxy and get going
`proxy-basecoin -tmchain=$TM_CHAIN -chain=$BC_CHAIN -rpc=localhost:46657`
`proxy-basecoin -tmchain=$TM_CHAIN -chain=$BC_CHAIN -rpc=localhost:26657`
## Basecoin accounts ## Basecoin accounts


+ 5
- 5
mintnet-kubernetes/examples/counter/app.yaml View File

@ -9,9 +9,9 @@ metadata:
app: counter app: counter
spec: spec:
ports: ports:
- port: 46656
- port: 26656
name: p2p name: p2p
- port: 46657
- port: 26657
name: rpc name: rpc
clusterIP: None clusterIP: None
selector: selector:
@ -83,9 +83,9 @@ spec:
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
image: tendermint/tendermint:0.10.0 image: tendermint/tendermint:0.10.0
ports: ports:
- containerPort: 46656
- containerPort: 26656
name: p2p name: p2p
- containerPort: 46657
- containerPort: 26657
name: rpc name: rpc
env: env:
- name: SEEDS - name: SEEDS
@ -140,7 +140,7 @@ spec:
IFS=',' read -ra SEEDS_ARR <<< "$SEEDS" IFS=',' read -ra SEEDS_ARR <<< "$SEEDS"
seeds=() seeds=()
for s in "${SEEDS_ARR[@]}"; do for s in "${SEEDS_ARR[@]}"; do
seeds+=("$s.$fqdn_suffix:46656")
seeds+=("$s.$fqdn_suffix:26656")
done done
seeds=$(IFS=','; echo "${seeds[*]}") seeds=$(IFS=','; echo "${seeds[*]}")


+ 5
- 5
mintnet-kubernetes/examples/dummy/app.yaml View File

@ -9,9 +9,9 @@ metadata:
app: dummy app: dummy
spec: spec:
ports: ports:
- port: 46656
- port: 26656
name: p2p name: p2p
- port: 46657
- port: 26657
name: rpc name: rpc
clusterIP: None clusterIP: None
selector: selector:
@ -83,9 +83,9 @@ spec:
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
image: tendermint/tendermint:0.10.0 image: tendermint/tendermint:0.10.0
ports: ports:
- containerPort: 46656
- containerPort: 26656
name: p2p name: p2p
- containerPort: 46657
- containerPort: 26657
name: rpc name: rpc
env: env:
- name: SEEDS - name: SEEDS
@ -140,7 +140,7 @@ spec:
IFS=',' read -ra SEEDS_ARR <<< "$SEEDS" IFS=',' read -ra SEEDS_ARR <<< "$SEEDS"
seeds=() seeds=()
for s in "${SEEDS_ARR[@]}"; do for s in "${SEEDS_ARR[@]}"; do
seeds+=("$s.$fqdn_suffix:46656")
seeds+=("$s.$fqdn_suffix:26656")
done done
seeds=$(IFS=','; echo "${seeds[*]}") seeds=$(IFS=','; echo "${seeds[*]}")


+ 2
- 2
mintnet-kubernetes/examples/dummy/tm-monitor-pod.yaml View File

@ -7,7 +7,7 @@ spec:
containers: containers:
- name: monitor - name: monitor
image: tendermint/monitor image: tendermint/monitor
args: ["-listen-addr=tcp://0.0.0.0:46670", "tm-0.dummy:46657,tm-1.dummy:46657,tm-2.dummy:46657,tm-3.dummy:46657"]
args: ["-listen-addr=tcp://0.0.0.0:26670", "tm-0.dummy:26657,tm-1.dummy:26657,tm-2.dummy:26657,tm-3.dummy:26657"]
ports: ports:
- containerPort: 46670
- containerPort: 26670
name: rpc name: rpc

+ 1
- 1
mintnet-kubernetes/examples/dummy/transacter-pod.yaml View File

@ -14,6 +14,6 @@ spec:
set -ex set -ex
while true while true
do do
./transact 100 "tm-0.dummy:46657"
./transact 100 "tm-0.dummy:26657"
sleep 1 sleep 1
done done

+ 3
- 3
tm-bench/README.md View File

@ -6,7 +6,7 @@ Tendermint blockchain benchmarking tool:
For example, the following: For example, the following:
tm-bench -T 10 -r 1000 localhost:46657
tm-bench -T 10 -r 1000 localhost:26657
will output: will output:
@ -24,7 +24,7 @@ then run:
tendermint init tendermint init
tendermint node --proxy_app=kvstore tendermint node --proxy_app=kvstore
tm-bench localhost:46657
tm-bench localhost:26657
with the last command being in a seperate window. with the last command being in a seperate window.
@ -33,7 +33,7 @@ with the last command being in a seperate window.
tm-bench [-c 1] [-T 10] [-r 1000] [endpoints] tm-bench [-c 1] [-T 10] [-r 1000] [endpoints]
Examples: Examples:
tm-bench localhost:46657
tm-bench localhost:26657
Flags: Flags:
-T int -T int
Exit after the specified amount of time in seconds (default 10) Exit after the specified amount of time in seconds (default 10)


+ 1
- 1
tm-bench/main.go View File

@ -45,7 +45,7 @@ Usage:
tm-bench [-c 1] [-T 10] [-r 1000] [endpoints] [-output-format <plain|json> [-broadcast-tx-method <async|sync|commit>]] tm-bench [-c 1] [-T 10] [-r 1000] [endpoints] [-output-format <plain|json> [-broadcast-tx-method <async|sync|commit>]]
Examples: Examples:
tm-bench localhost:46657`)
tm-bench localhost:26657`)
fmt.Println("Flags:") fmt.Println("Flags:")
flag.PrintDefaults() flag.PrintDefaults()
} }


+ 15
- 15
tm-monitor/README.md View File

@ -13,17 +13,17 @@ Assuming your application is running in another container with the name
`app`: `app`:
docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint init docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint init
docker run -it --rm -v "/tmp:/tendermint" -p "46657:46657" --name=tm --link=app tendermint/tendermint node --proxy_app=tcp://app:46658
docker run -it --rm -v "/tmp:/tendermint" -p "26657:26657" --name=tm --link=app tendermint/tendermint node --proxy_app=tcp://app:26658
docker run -it --rm -p "46670:46670" --link=tm tendermint/monitor tm:46657
docker run -it --rm -p "26670:26670" --link=tm tendermint/monitor tm:26657
If you don't have an application yet, but still want to try monitor out, If you don't have an application yet, but still want to try monitor out,
use `kvstore`: use `kvstore`:
docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint init docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint init
docker run -it --rm -v "/tmp:/tendermint" -p "46657:46657" --name=tm tendermint/tendermint node --proxy_app=kvstore
docker run -it --rm -v "/tmp:/tendermint" -p "26657:26657" --name=tm tendermint/tendermint node --proxy_app=kvstore
docker run -it --rm -p "46670:46670" --link=tm tendermint/monitor tm:46657
docker run -it --rm -p "26670:26670" --link=tm tendermint/monitor tm:26657
### Using Binaries ### Using Binaries
@ -34,37 +34,37 @@ then run:
tendermint init tendermint init
tendermint node --proxy_app=kvstore tendermint node --proxy_app=kvstore
tm-monitor localhost:46657
tm-monitor localhost:26657
with the last command being in a seperate window. with the last command being in a seperate window.
## Usage ## Usage
tm-monitor [-v] [-no-ton] [-listen-addr="tcp://0.0.0.0:46670"] [endpoints]
tm-monitor [-v] [-no-ton] [-listen-addr="tcp://0.0.0.0:26670"] [endpoints]
Examples: Examples:
# monitor single instance # monitor single instance
tm-monitor localhost:46657
tm-monitor localhost:26657
# monitor a few instances by providing comma-separated list of RPC endpoints # monitor a few instances by providing comma-separated list of RPC endpoints
tm-monitor host1:46657,host2:46657
tm-monitor host1:26657,host2:26657
Flags: Flags:
-listen-addr string -listen-addr string
HTTP and Websocket server listen address (default "tcp://0.0.0.0:46670")
HTTP and Websocket server listen address (default "tcp://0.0.0.0:26670")
-no-ton -no-ton
Do not show ton (table of nodes) Do not show ton (table of nodes)
-v verbose logging -v verbose logging
### RPC UI ### RPC UI
Run `tm-monitor` and visit http://localhost:46670 You should see the
Run `tm-monitor` and visit http://localhost:26670 You should see the
list of the available RPC endpoints: list of the available RPC endpoints:
http://localhost:46670/status
http://localhost:46670/status/network
http://localhost:46670/monitor?endpoint=_
http://localhost:46670/status/node?name=_
http://localhost:46670/unmonitor?endpoint=_
http://localhost:26670/status
http://localhost:26670/status/network
http://localhost:26670/monitor?endpoint=_
http://localhost:26670/status/node?name=_
http://localhost:26670/unmonitor?endpoint=_
The API is available as GET requests with URI encoded parameters, or as The API is available as GET requests with URI encoded parameters, or as
JSONRPC POST requests. The JSONRPC methods are also exposed over JSONRPC POST requests. The JSONRPC methods are also exposed over


+ 4
- 4
tm-monitor/main.go View File

@ -19,7 +19,7 @@ func main() {
var listenAddr string var listenAddr string
var noton bool var noton bool
flag.StringVar(&listenAddr, "listen-addr", "tcp://0.0.0.0:46670", "HTTP and Websocket server listen address")
flag.StringVar(&listenAddr, "listen-addr", "tcp://0.0.0.0:26670", "HTTP and Websocket server listen address")
flag.BoolVar(&noton, "no-ton", false, "Do not show ton (table of nodes)") flag.BoolVar(&noton, "no-ton", false, "Do not show ton (table of nodes)")
flag.Usage = func() { flag.Usage = func() {
@ -27,14 +27,14 @@ func main() {
applications, collecting and providing various statistics to the user. applications, collecting and providing various statistics to the user.
Usage: Usage:
tm-monitor [-no-ton] [-listen-addr="tcp://0.0.0.0:46670"] [endpoints]
tm-monitor [-no-ton] [-listen-addr="tcp://0.0.0.0:26670"] [endpoints]
Examples: Examples:
# monitor single instance # monitor single instance
tm-monitor localhost:46657
tm-monitor localhost:26657
# monitor a few instances by providing comma-separated list of RPC endpoints # monitor a few instances by providing comma-separated list of RPC endpoints
tm-monitor host1:46657,host2:46657`)
tm-monitor host1:26657,host2:26657`)
fmt.Println("Flags:") fmt.Println("Flags:")
flag.PrintDefaults() flag.PrintDefaults()
} }


+ 1
- 1
tm-monitor/monitor/monitor_test.go View File

@ -67,6 +67,6 @@ func createValidatorNode(t *testing.T) (n *monitor.Node, emMock *mock.EventMeter
rpcClientMock := &mock.RpcClient{Stubs: stubs} rpcClientMock := &mock.RpcClient{Stubs: stubs}
rpcClientMock.SetCodec(cdc) rpcClientMock.SetCodec(cdc)
n = monitor.NewNodeWithEventMeterAndRpcClient("tcp://127.0.0.1:46657", emMock, rpcClientMock)
n = monitor.NewNodeWithEventMeterAndRpcClient("tcp://127.0.0.1:26657", emMock, rpcClientMock)
return return
} }

+ 1
- 1
tm-monitor/monitor/node_test.go View File

@ -85,7 +85,7 @@ func startValidatorNode(t *testing.T) (n *monitor.Node, emMock *mock.EventMeter)
rpcClientMock := &mock.RpcClient{Stubs: stubs} rpcClientMock := &mock.RpcClient{Stubs: stubs}
rpcClientMock.SetCodec(cdc) rpcClientMock.SetCodec(cdc)
n = monitor.NewNodeWithEventMeterAndRpcClient("tcp://127.0.0.1:46657", emMock, rpcClientMock)
n = monitor.NewNodeWithEventMeterAndRpcClient("tcp://127.0.0.1:26657", emMock, rpcClientMock)
err := n.Start() err := n.Start()
require.Nil(t, err) require.Nil(t, err)


+ 1
- 1
transact/transact.go View File

@ -51,7 +51,7 @@ func broadcastTxsToHost(wg *sync.WaitGroup, errCh chan error, valI int, valHost
reconnectSleepSeconds := time.Second * 1 reconnectSleepSeconds := time.Second * 1
// thisStart := time.Now() // thisStart := time.Now()
// cli := rpcclient.NewClientURI(valHost + ":46657")
// cli := rpcclient.NewClientURI(valHost + ":26657")
fmt.Println("Connecting to host to broadcast txs", valI, valHost) fmt.Println("Connecting to host to broadcast txs", valI, valHost)
cli := rpcclient.NewWSClient(valHost, "/websocket") cli := rpcclient.NewWSClient(valHost, "/websocket")
if _, err := cli.Start(); err != nil { if _, err := cli.Start(); err != nil {


Loading…
Cancel
Save