Merge branch 'Ursula/UD' of gitlab.com:elixxir/client into Ursula/UD

ud/lookup.go

@@ -117,7 +117,7 @@ func (m *Manager) Lookup(uid *id.ID, callback lookupCallback, timeout time.Durat
 			select {
 			// Return an error if the round fails
 			case fail := <-roundFailChan:
-				if states.Round(fail.RoundInfo.State)==states.FAILED{
+				if states.Round(fail.RoundInfo.State)==states.FAILED || fail.TimedOut{
 					fType := ""
 					if fail.TimedOut{
 						fType = "timeout"

ud/search.go

@@ -120,7 +120,7 @@ func (m *Manager) Search(list fact.FactList, callback searchCallback, timeout ti
 			select {
 			// Return an error if the round fails
 			case fail := <-roundFailChan:
-				if states.Round(fail.RoundInfo.State)==states.FAILED{
+				if states.Round(fail.RoundInfo.State)==states.FAILED || fail.TimedOut{
 					fType := ""
 					if fail.TimedOut{
 						fType = "timeout"