Merge branch 'milestone2' into feature/persistent-settings

# Conflicts: # pkg/visor/visor.go
skycoin · Jan 16, 2020 · d659046 · d659046
2 parents 335dfec + 9b6d140
commit d659046
Show file tree

Hide file tree

Showing 47 changed files with 234 additions and 262 deletions.
diff --git a/ci_scripts/run-pkg-tests.sh b/ci_scripts/run-pkg-tests.sh
@@ -13,7 +13,7 @@ go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m
 
 go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/hypervisor -run TestNewNode >> ./logs/pkg/TestNewNode.log
 
-go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/node	 -run TestMessagingDiscovery >> ./logs/pkg/TestMessagingDiscovery.log
+go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/node	 -run TestDmsgDiscovery >> ./logs/pkg/TestDmsgDiscovery.log
 go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/node	 -run TestTransportDiscovery >> ./logs/pkg/TestTransportDiscovery.log
 go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/node	 -run TestTransportLogStore >> ./logs/pkg/TestTransportLogStore.log
 go clean -testcache &> /dev/null || go test -race -tags no_ci -cover -timeout=5m github.com/SkycoinProject/skywire-mainnet/pkg/node	 -run TestRoutingTable >> ./logs/pkg/TestRoutingTable.log

diff --git a/cmd/setup-node/config.json b/cmd/setup-node/config.json
@@ -1,7 +1,7 @@
 {
   "public_key": "024ec47420176680816e0406250e7156465e4531f5b26057c9f6297bb0303558c7",
   "secret_key": "42bca4df2f3189b28872d40e6c61aacd5e85b8e91f8fea65780af27c142419e5",
-  "messaging": {
+  "dmsg": {
     "discovery": "http://skywire.skycoin.net:8001",
     "sessions_count": 1
   },

diff --git a/cmd/skywire-cli/commands/mdisc/root.go b/cmd/skywire-cli/commands/mdisc/root.go
@@ -18,13 +18,13 @@ import (
 var mdAddr string
 
 func init() {
-	RootCmd.PersistentFlags().StringVar(&mdAddr, "addr", skyenv.DefaultDmsgDiscAddr, "address of messaging discovery server")
+	RootCmd.PersistentFlags().StringVar(&mdAddr, "addr", skyenv.DefaultDmsgDiscAddr, "address of DMSG discovery server")
 }
 
-// RootCmd is the command that contains sub-commands which interacts with messaging services.
+// RootCmd is the command that contains sub-commands which interacts with DMSG services.
 var RootCmd = &cobra.Command{
 	Use:   "mdisc",
-	Short: "Contains sub-commands that interact with a remote Messaging Discovery",
+	Short: "Contains sub-commands that interact with a remote DMSG Discovery",
 }
 
 func init() {
@@ -36,7 +36,7 @@ func init() {
 
 var entryCmd = &cobra.Command{
 	Use:   "entry <node-public-key>",
-	Short: "fetches an entry from messaging-discovery",
+	Short: "fetches an entry from DMSG discovery",
 	Args:  cobra.MinimumNArgs(1),
 	Run: func(_ *cobra.Command, args []string) {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
@@ -50,7 +50,7 @@ var entryCmd = &cobra.Command{
 
 var availableServersCmd = &cobra.Command{
 	Use:   "available-servers",
-	Short: "fetch available servers from messaging-discovery",
+	Short: "fetch available servers from DMSG discovery",
 	Run: func(_ *cobra.Command, _ []string) {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 		defer cancel()

diff --git a/cmd/skywire-cli/commands/node/gen-config.go b/cmd/skywire-cli/commands/node/gen-config.go
@@ -94,11 +94,11 @@ func defaultConfig() *visor.Config {
 	conf.STCP.LocalAddr = lIPaddr
 
 	if testenv {
-		conf.Messaging.Discovery = skyenv.TestDmsgDiscAddr
+		conf.Dmsg.Discovery = skyenv.TestDmsgDiscAddr
 	} else {
-		conf.Messaging.Discovery = skyenv.DefaultDmsgDiscAddr
+		conf.Dmsg.Discovery = skyenv.DefaultDmsgDiscAddr
 	}
-	conf.Messaging.SessionsCount = 1
+	conf.Dmsg.SessionsCount = 1
 
 	ptyConf := defaultDmsgPtyConfig()
 	conf.DmsgPty = &ptyConf

diff --git a/cmd/skywire-visor/config.json b/cmd/skywire-visor/config.json
@@ -4,15 +4,8 @@
     "static_public_key": "024ec47420176680816e0406250e7156465e4531f5b26057c9f6297bb0303558c7",
     "static_secret_key": "42bca4df2f3189b28872d40e6c61aacd5e85b8e91f8fea65780af27c142419e5"
   },
-  "messaging": {
-    "server": false,
-    "public": true,
+  "dmsg": {
     "discovery": "http://skywire.skycoin.net:8001",
-    "delegated_servers": [
-      "03a714db33a696a1202de568485234d5035935040bd85a87925568e3ddd100f1e3",
-      "02709cebf98a35431407068ee0740233224795315e3b218054431da80d9c827f07",
-      "03cf6b2ab045aa96d39a58cc087177d1d94944f61a131ec4a69327d5007a8e9953"
-    ],
     "sessions_count": 5
   },
   "apps": [

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/SkycoinProject/skywire-mainnet
 go 1.13
 
 require (
-	github.com/SkycoinProject/dmsg v0.0.0-20191107094546-85c27858fca6
+	github.com/SkycoinProject/dmsg v0.0.0-20200116114634-91be578a1895
 	github.com/SkycoinProject/skycoin v0.26.0
 	github.com/SkycoinProject/yamux v0.0.0-20191213015001-a36efeefbf6a
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
@@ -26,4 +26,4 @@ require (
 	golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a
 )
 
-replace github.com/SkycoinProject/dmsg => ../dmsg
+//replace github.com/SkycoinProject/dmsg => ../dmsg
diff --git a/go.sum b/go.sum
@@ -3,6 +3,8 @@ github.com/SkycoinProject/dmsg v0.0.0-20191106075825-cabc26522b11 h1:OpkHFoRtTKk
 github.com/SkycoinProject/dmsg v0.0.0-20191106075825-cabc26522b11/go.mod h1:aJrtm4X13hJDh+EX4amx51EBaLvSKjhFH8tf0E8Xxx4=
 github.com/SkycoinProject/dmsg v0.0.0-20191107094546-85c27858fca6 h1:qL8+QqCaEzNO4vesE50kZyX1o7BOiwxUMYi1OX/J6KM=
 github.com/SkycoinProject/dmsg v0.0.0-20191107094546-85c27858fca6/go.mod h1:Omi1J0gOWWriHkHn/9aGw8JXHtsEfnYwithZY6fIEQY=
+github.com/SkycoinProject/dmsg v0.0.0-20200116114634-91be578a1895 h1:lnTxeHdSdju5bdFknXD5CsxYe+MVAuBwFeHcG6DgYGA=
+github.com/SkycoinProject/dmsg v0.0.0-20200116114634-91be578a1895/go.mod h1:ND2IgJU0IdbkF1FS0We0EoI/2Gqx6MWJe12zC/KsTzI=
 github.com/SkycoinProject/skycoin v0.26.0 h1:8/ZRZb2VM2DM4YTIitRJMZ3Yo/3H1FFmbCMx5o6ekmA=
 github.com/SkycoinProject/skycoin v0.26.0/go.mod h1:xqPLOKh5B6GBZlGA7B5IJfQmCy7mwimD9NlqxR3gMXo=
 github.com/SkycoinProject/yamux v0.0.0-20191213015001-a36efeefbf6a h1:6nHCJqh7trsuRcpMC5JmtDukUndn2VC9sY64K6xQ7hQ=
@@ -198,6 +200,7 @@ golang.org/x/tools v0.0.0-20191206204035-259af5ff87bd/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20200110213125-a7a6caa82ab2 h1:V9r/14uGBqLgNlHRYWdVqjMdWkcOHnE2KG8DwVqQSEc=
 golang.org/x/tools v0.0.0-20200110213125-a7a6caa82ab2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200115044656-831fdb1e1868/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200116062425-473961ec044c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=

diff --git a/integration/InteractiveEnvironments.md b/integration/InteractiveEnvironments.md
@@ -139,8 +139,8 @@ The following steps will be performed:
 
 1. copy sw*.json and start-restart-nodeB.sh into skywire directory
 2. Create 9 tmux windows:
-   1. MSGD: messaging-discovery
-   2. MSG: messaging-server
+   1. MSGD: dmsg-discovery
+   2. MSG: dmsg-server
    3. TRD: transport-discovery
    4. RF: route-finder
    5. SN: setup-node
@@ -149,7 +149,7 @@ The following steps will be performed:
    8. NodeC: first skywire-visor with generic/nodeC.json
    9. shell: new shell for interactive exploration
 3. ENV-vars in shell-window:
-   1. $MSG_PK, $SN_PK - public keys of messaging-server and setup-node
+   1. $MSG_PK, $SN_PK - public keys of dmsg-server and setup-node
    2. $PK_A, $PK_B, $PK_C - public keys of node_A, node_B, node_C
    3. $RPC_A, $RPC_B, $RPC_C - `--rpc` param for ../skywire/skywire-cli
    4. $CHAT_A, $CHAT_B - addresses and ports for `skychat`-apps on node_A and node_C

diff --git a/integration/check-services.sh b/integration/check-services.sh
@@ -1,17 +1,17 @@
 
-echo -e "\n\n" MESSAGING-DISCOVERY 
+echo -e "\n\n" DMSG-DISCOVERY
 
-echo -e "\n\n" $MSGD/messaging-discovery/available_servers"\n"
-curl $MSGD/messaging-discovery/available_servers
+echo -e "\n\n" $MSGD/dmsg-discovery/available_servers"\n"
+curl $MSGD/dmsg-discovery/available_servers
 
-echo -e "\n\n" $MSGD/messaging-discovery/entry/PK_A"\n"
-curl $MSGD/messaging-discovery/entry/$PK_A
+echo -e "\n\n" $MSGD/dmsg-discovery/entry/PK_A"\n"
+curl $MSGD/dmsg-discovery/entry/$PK_A
 
-echo -e "\n\n" $MSGD/messaging-discovery/entry/PK_B"\n"
-curl $MSGD/messaging-discovery/entry/$PK_B
+echo -e "\n\n" $MSGD/dmsg-discovery/entry/PK_B"\n"
+curl $MSGD/dmsg-discovery/entry/$PK_B
 
-echo -e "\n\n" $MSGD/messaging-discovery/entry/PK_C"\n"
-curl $MSGD/messaging-discovery/entry/$PK_C
+echo -e "\n\n" $MSGD/dmsg-discovery/entry/PK_C"\n"
+curl $MSGD/dmsg-discovery/entry/$PK_C
 
 
 echo -e "\n\n" TRANSPORT-DISCOVERY 

diff --git a/integration/generic/env-vars.sh b/integration/generic/env-vars.sh
@@ -14,9 +14,9 @@ alias CLI_A='./skywire-cli --rpc $RPC_A'
 alias CLI_B='./skywire-cli --rpc $RPC_B'
 alias CLI_C='./skywire-cli --rpc $RPC_C'
 
-export MSGD=https://messaging.discovery.skywire.skycoin.net
-export TRD=https://transport.discovery.skywire.skycoin.net
-export RF=https://routefinder.skywire.skycoin.net
+export MSGD=https://dmsg.discovery.skywire.skycoin.com
+export TRD=https://transport.discovery.skywire.skycoin.com
+export RF=https://routefinder.skywire.skycoin.com
 
 echo PK_A: $PK_A
 echo PK_B: $PK_B

diff --git a/integration/generic/nodeA.json b/integration/generic/nodeA.json
@@ -4,12 +4,12 @@
     "static_public_key": "02072dd1e2ccd761e717096e1a264de1d8917e78e3176ca99dbf7ccf7292969845",
     "static_secret_key": "7073e557aa2308b448525397ea2f45d56c9962c4dcdf82c5fdb5cc02fca0481c"
   },
-  "messaging": {
-    "discovery": "https://messaging.discovery.skywire.skycoin.net",
+  "dmsg": {
+    "discovery": "https://dmsg.discovery.skywire.skycoin.com",
     "sessions_count": 1
   },
   "transport": {
-    "discovery": "https://transport.discovery.skywire.skycoin.net",
+    "discovery": "https://transport.discovery.skywire.skycoin.com",
     "log_store": {
       "type": "file",
       "location": "./local/nodeA/transport_logs"
@@ -19,7 +19,7 @@
     "setup_nodes": [
       "0324579f003e6b4048bae2def4365e634d8e0e3054a20fc7af49daf2a179658557"
     ],
-    "route_finder": "https://routefinder.skywire.skycoin.net/"
+    "route_finder": "https://routefinder.skywire.skycoin.com/"
   },
   "apps": [
     {

diff --git a/integration/generic/nodeC.json b/integration/generic/nodeC.json
@@ -4,12 +4,12 @@
     "static_public_key": "02c9ddf5c2ae6a5a2166028dafbc814eff3ec2352f429fb0aa37d96e1aa668f332",
     "static_secret_key": "5ab3744ab56e4d0b82f9a915e07b8f05d51ec0f16ff8496bd92f4e378ca6c1fc"
   },
-  "messaging": {
-    "discovery": "https://messaging.discovery.skywire.skycoin.net",
+  "dmsg": {
+    "discovery": "https://dmsg.discovery.skywire.skycoin.com",
     "sessions_count": 1
   },
   "transport": {
-    "discovery": "https://transport.discovery.skywire.skycoin.net",
+    "discovery": "https://transport.discovery.skywire.skycoin.com",
     "log_store": {
       "type": "file",
       "location": "./local/nodeC/transport_logs"
@@ -19,7 +19,7 @@
     "setup_nodes": [
       "0324579f003e6b4048bae2def4365e634d8e0e3054a20fc7af49daf2a179658557"
     ],
-    "route_finder": "https://routefinder.skywire.skycoin.net/"
+    "route_finder": "https://routefinder.skywire.skycoin.com/"
   },
   "apps": [
     {

diff --git a/integration/intermediary-nodeB.json b/integration/intermediary-nodeB.json
@@ -4,12 +4,12 @@
     "static_public_key": "0372ee0a2b99b55906ac33b49704073ab90ab4f395d814d48d597b5b42c39e5c79",
     "static_secret_key": "5092f14fe18bd7dcd34479c5d26bb3bf68b708ec74a12c4557091e82dd6e6c36"
   },
-  "messaging": {
-    "discovery": "https://messaging.discovery.skywire.skycoin.net",
+  "dmsg": {
+    "discovery": "https://dmsg.discovery.skywire.skycoin.com",
     "sessions_count": 1
   },
   "transport": {
-    "discovery": "https://transport.discovery.skywire.skycoin.net",
+    "discovery": "https://transport.discovery.skywire.skycoin.com",
     "log_store": {
       "type": "file",
       "location": "./local/nodeB/transport_logs"
@@ -19,7 +19,7 @@
     "setup_nodes": [
       "0324579f003e6b4048bae2def4365e634d8e0e3054a20fc7af49daf2a179658557"
     ],
-    "route_finder": "https://routefinder.skywire.skycoin.net/",
+    "route_finder": "https://routefinder.skywire.skycoin.com/",
     "route_finder_timeout": "60s"
   },
   "apps": [],

diff --git a/integration/messaging/env-vars.sh b/integration/messaging/env-vars.sh
@@ -10,9 +10,9 @@ export RPC_C=$(jq -r ".interfaces.rpc" ./integration/messaging/nodeC.json)
 export CHAT_A=http://localhost:8000/message
 export CHAT_C=http://localhost$(jq -r '.apps [] |select(.app=="skychat")| .args[1] ' ./integration/messaging/nodeC.json)/message
 
-export MSGD=https://messaging.discovery.skywire.skycoin.net
-export TRD=https://transport.discovery.skywire.skycoin.net
-export RF=https://routefinder.skywire.skycoin.net
+export MSGD=https://dmsg.discovery.skywire.skycoin.com
+export TRD=https://transport.discovery.skywire.skycoin.com
+export RF=https://routefinder.skywire.skycoin.com
 
 alias CLI_A='./skywire-cli --rpc $RPC_A'
 alias CLI_B='./skywire-cli --rpc $RPC_B'

diff --git a/integration/messaging/nodeA.json b/integration/messaging/nodeA.json
@@ -4,12 +4,12 @@
     "static_public_key": "02072dd1e2ccd761e717096e1a264de1d8917e78e3176ca99dbf7ccf7292969845",
     "static_secret_key": "7073e557aa2308b448525397ea2f45d56c9962c4dcdf82c5fdb5cc02fca0481c"
   },
-  "messaging": {
-    "discovery": "https://messaging.discovery.skywire.skycoin.net",
+  "dmsg": {
+    "discovery": "https://dmsg.discovery.skywire.skycoin.com",
     "sessions_count": 1
   },
   "transport": {
-    "discovery": "https://transport.discovery.skywire.skycoin.net",
+    "discovery": "https://transport.discovery.skywire.skycoin.com",
     "log_store": {
       "type": "file",
       "location": "./local/nodeA/transport_logs"
@@ -19,7 +19,7 @@
     "setup_nodes": [
       "0324579f003e6b4048bae2def4365e634d8e0e3054a20fc7af49daf2a179658557"
     ],
-    "route_finder": "https://routefinder.skywire.skycoin.net/",
+    "route_finder": "https://routefinder.skywire.skycoin.com/",
     "route_finder_timeout": "60s"
   },
   "apps": [

diff --git a/integration/messaging/nodeC.json b/integration/messaging/nodeC.json
@@ -4,12 +4,12 @@
     "static_public_key": "02c9ddf5c2ae6a5a2166028dafbc814eff3ec2352f429fb0aa37d96e1aa668f332",
     "static_secret_key": "5ab3744ab56e4d0b82f9a915e07b8f05d51ec0f16ff8496bd92f4e378ca6c1fc"
   },
-  "messaging": {
-    "discovery": "https://messaging.discovery.skywire.skycoin.net",
+  "dmsg": {
+    "discovery": "https://dmsg.discovery.skywire.skycoin.com",
     "sessions_count": 1
   },
   "transport": {
-    "discovery": "https://transport.discovery.skywire.skycoin.net",
+    "discovery": "https://transport.discovery.skywire.skycoin.com",
     "log_store": {
       "type": "file",
       "location": "./local/nodeC/transport_logs"
@@ -19,7 +19,7 @@
     "setup_nodes": [
       "0324579f003e6b4048bae2def4365e634d8e0e3054a20fc7af49daf2a179658557"
     ],
-    "route_finder": "https://routefinder.skywire.skycoin.net/",
+    "route_finder": "https://routefinder.skywire.skycoin.com/",
     "route_finder_timeout": "60s"
   },
   "apps": [

diff --git a/integration/proxy/env-vars.sh b/integration/proxy/env-vars.sh
@@ -11,9 +11,9 @@ alias CLI_A='./skywire-cli --rpc $RPC_A'
 alias CLI_B='./skywire-cli --rpc $RPC_B'
 alias CLI_C='./skywire-cli --rpc $RPC_C'
 
-export MSGD=https://messaging.discovery.skywire.skycoin.net
-export TRD=https://transport.discovery.skywire.skycoin.net
-export RF=https://routefinder.skywire.skycoin.net
+export MSGD=https://dmsg.discovery.skywire.skycoin.com
+export TRD=https://transport.discovery.skywire.skycoin.com
+export RF=https://routefinder.skywire.skycoin.com
 
 alias RUN_A='go run ./cmd/skywire-visor ./integration/messaging/nodeA.json --tag NodeA'
 alias RUN_B='go run ./cmd/skywire-visor ./integration/intermediary-nodeB.json --tag NodeB'

diff --git a/integration/proxy/nodeA.json b/integration/proxy/nodeA.json
@@ -4,12 +4,12 @@
     "static_public_key": "02072dd1e2ccd761e717096e1a264de1d8917e78e3176ca99dbf7ccf7292969845",
     "static_secret_key": "7073e557aa2308b448525397ea2f45d56c9962c4dcdf82c5fdb5cc02fca0481c"
   },
-  "messaging": {
-    "discovery": "https://messaging.discovery.skywire.skycoin.net",
+  "dmsg": {
+    "discovery": "https://dmsg.discovery.skywire.skycoin.com",
     "sessions_count": 1
   },
   "transport": {
-    "discovery": "https://transport.discovery.skywire.skycoin.net",
+    "discovery": "https://transport.discovery.skywire.skycoin.com",
     "log_store": {
       "type": "file",
       "location": "./local/nodeA/transport_logs"
@@ -19,7 +19,7 @@
     "setup_nodes": [
       "0324579f003e6b4048bae2def4365e634d8e0e3054a20fc7af49daf2a179658557"
     ],
-    "route_finder": "https://routefinder.skywire.skycoin.net/"
+    "route_finder": "https://routefinder.skywire.skycoin.com/"
   },
   "apps": [
     {

diff --git a/integration/proxy/nodeC.json b/integration/proxy/nodeC.json
@@ -4,12 +4,12 @@
     "static_public_key": "02c9ddf5c2ae6a5a2166028dafbc814eff3ec2352f429fb0aa37d96e1aa668f332",
     "static_secret_key": "5ab3744ab56e4d0b82f9a915e07b8f05d51ec0f16ff8496bd92f4e378ca6c1fc"
   },
-  "messaging": {
-    "discovery": "https://messaging.discovery.skywire.skycoin.net",
+  "dmsg": {
+    "discovery": "https://dmsg.discovery.skywire.skycoin.com",
     "sessions_count": 1
   },
   "transport": {
-    "discovery": "https://transport.discovery.skywire.skycoin.net",
+    "discovery": "https://transport.discovery.skywire.skycoin.com",
     "log_store": {
       "type": "file",
       "location": "./local/nodeC/transport_logs"
@@ -19,7 +19,7 @@
     "setup_nodes": [
       "0324579f003e6b4048bae2def4365e634d8e0e3054a20fc7af49daf2a179658557"
     ],
-    "route_finder": "https://routefinder.skywire.skycoin.net/"
+    "route_finder": "https://routefinder.skywire.skycoin.com/"
   },
   "apps": [
     {

diff --git a/internal/utclient/client.go b/internal/utclient/client.go
@@ -24,7 +24,7 @@ type Error struct {
 	Error string `json:"error"`
 }
 
-// APIClient implements messaging discovery API client.
+// APIClient implements DMSG discovery API client.
 type APIClient interface {
 	UpdateNodeUptime(context.Context) error
 }

diff --git a/pkg/app/appnet/addr.go b/pkg/app/appnet/addr.go
@@ -44,7 +44,7 @@ func ConvertAddr(addr net.Addr) (Addr, error) {
 	switch a := addr.(type) {
 	case dmsg.Addr:
 		return Addr{
-			Net:    TypeDMSG,
+			Net:    TypeDmsg,
 			PubKey: a.PK,
 			Port:   routing.Port(a.Port),
 		}, nil