From 0d080e4332aaf603320e0cb32bd94bbdbb1a235e Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Wed, 21 Nov 2018 15:07:57 -0800
Subject: [PATCH] name update

---
 application/application.go           | 4 ++--
 application/examples/echobot/main.go | 2 +-
 connectivity/{mixnet.go => acn.go}   | 4 ++--
 connectivity/localProvider.go        | 4 ++--
 connectivity/torProvider.go          | 6 +++---
 ricochet.go                          | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename connectivity/{mixnet.go => acn.go} (87%)

diff --git a/application/application.go b/application/application.go
index e32bf50..bbee427 100644
--- a/application/application.go
+++ b/application/application.go
@@ -23,14 +23,14 @@ type RicochetApplication struct {
 	v3identity     identity.Identity
 	name           string
 	ls             connectivity.ListenService
-	mn             connectivity.Mixnet
+	mn             connectivity.ACN
 	instances      []*ApplicationInstance
 	lock           sync.Mutex
 	aif            ApplicationInstanceFactory
 }
 
 // Init initializes the underlying RicochetApplication datastructure, making it ready for use
-func (ra *RicochetApplication) Init(mn connectivity.Mixnet, name string, v3identity identity.Identity, af ApplicationInstanceFactory, cm ContactManagerInterface) {
+func (ra *RicochetApplication) Init(mn connectivity.ACN, name string, v3identity identity.Identity, af ApplicationInstanceFactory, cm ContactManagerInterface) {
 	ra.mn = mn
 	ra.name = name
 	ra.v3identity = v3identity
diff --git a/application/examples/echobot/main.go b/application/examples/echobot/main.go
index 6ad95b6..86c04c5 100644
--- a/application/examples/echobot/main.go
+++ b/application/examples/echobot/main.go
@@ -114,7 +114,7 @@ func main() {
 	time.Sleep(time.Second * 30)
 }
 
-func NewAliceBot(mn connectivity.Mixnet, onion string) alicebot {
+func NewAliceBot(mn connectivity.ACN, onion string) alicebot {
 	alice := alicebot{}
 	alice.messages = make(map[uint32]string)
 
diff --git a/connectivity/mixnet.go b/connectivity/acn.go
similarity index 87%
rename from connectivity/mixnet.go
rename to connectivity/acn.go
index e541c7f..edbd430 100644
--- a/connectivity/mixnet.go
+++ b/connectivity/acn.go
@@ -19,8 +19,8 @@ type ListenService interface {
 	Close()
 }
 
-// Mixnet is mixnet implementation wrapper that supports Open for new connections and Listen to accept connections
-type Mixnet interface {
+// ACN is Anonymous Communication Network implementation wrapper that supports Open for new connections and Listen to accept connections
+type ACN interface {
 	// Open takes a hostname and returns a net.Conn to the derived endpoint
 	// Open allows a client to resolve various hostnames to connections
 	// The supported types are onions address are:
diff --git a/connectivity/localProvider.go b/connectivity/localProvider.go
index 90a6127..b1ae801 100644
--- a/connectivity/localProvider.go
+++ b/connectivity/localProvider.go
@@ -54,7 +54,7 @@ func (lp *localProvider) Close() {
 
 }
 
-// LocalProvider returns a for testing use only local clearnet implementation of a Mixnet interface
-func LocalProvider() Mixnet {
+// LocalProvider returns a for testing use only local clearnet implementation of a ACN interface
+func LocalProvider() ACN {
 	return &localProvider{}
 }
diff --git a/connectivity/torProvider.go b/connectivity/torProvider.go
index ce3ab4a..e938854 100644
--- a/connectivity/torProvider.go
+++ b/connectivity/torProvider.go
@@ -88,8 +88,8 @@ func (tp *torProvider) Close() {
 	tp.t.Close()
 }
 
-// StartTor creates/starts a Tor mixnet and returns a usable Mixnet object
-func StartTor(appDirectory string, bundledTorPath string) (Mixnet, error) {
+// StartTor creates/starts a Tor ACN and returns a usable ACN object
+func StartTor(appDirectory string, bundledTorPath string) (ACN, error) {
 	dataDir := path.Join(appDirectory, "tor")
 	os.MkdirAll(dataDir, 0700)
 
@@ -132,7 +132,7 @@ func StartTor(appDirectory string, bundledTorPath string) (Mixnet, error) {
 	return nil, errors.New("Could not connect to or start Tor that met requirments")
 }
 
-func createFromExisting(controlport *control.Conn, datadir string) Mixnet {
+func createFromExisting(controlport *control.Conn, datadir string) ACN {
 	t := &tor.Tor{
 		Process:              nil,
 		Control:              controlport,
diff --git a/ricochet.go b/ricochet.go
index 5028f43..b9a4b6f 100644
--- a/ricochet.go
+++ b/ricochet.go
@@ -13,7 +13,7 @@ import (
 // will be closed. This function blocks until version negotiation has completed.
 // The application should call Process() on the returned OpenConnection to continue
 // handling protocol messages.
-func Open(mn connectivity.Mixnet, remoteHostname string) (*connection.Connection, error) {
+func Open(mn connectivity.ACN, remoteHostname string) (*connection.Connection, error) {
 	conn, remoteHostname, err := mn.Open(remoteHostname)
 
 	if err != nil {