removing simple from commands

Author: ntozaks

src/cmd/configure.go

@@ -342,9 +342,6 @@ func (c configureCmdConfig) Run() {
 
 	// Make config file string
 	serverConfigFile := fmt.Sprintf("./wiretap serve -f %s", c.configFileServer)
-	if c.simple {
-		serverConfigFile = fmt.Sprintf("%s --simple", serverConfigFile)
-	}
 	if c.disableV6 {
 		serverConfigFile = fmt.Sprintf("%s --disable-ipv6", serverConfigFile)
 	}

src/cmd/serve.go

@@ -319,6 +319,10 @@ func (c serveCmdConfig) Run() {
 		check("config error", errors.New("no peer public keys provided"))
 	}
 
+	if viper.IsSet("E2EE.Peer.publickey") && !viper.IsSet("Relay.Peer.publickey") {
+		check("config error", errors.New("only E2EE public key provided"))
+	}
+
 	if !viper.IsSet("E2EE.Peer.publickey") {
 		fmt.Println("E2EE peer public key missing, running Wiretap in simple mode.")
 		serveCmd.simple = true

src/peer/config.go

@@ -522,11 +522,7 @@ func CreateServerCommand(relayConfig Config, e2eeConfig Config, shell Shell, sim
 			keys = append(keys, "WIRETAP_E2EE_PEER_ENDPOINT")
 			vals = append(vals, e2eeConfig.GetPeerEndpoint(0))
 		}
-	} else {
-		keys = append(keys, "WIRETAP_SIMPLE")
-		vals = append(vals, "true")
-	}
-
+	} 
 	if disableV6 {
 		keys = append(keys, "WIRETAP_DISABLEIPV6")
 		vals = append(vals, "true")