keypair err mgt + shorturl random improve

client/serverlist.go

@@ -8,13 +8,13 @@ import "errors"
 //   - Owned servers lists
 //   - Matriochka paths
 type ServerList struct {
-	Name    string   `json:"name,omitempty"`
-	Servers []Server `json:"servers,omitempty"`
+	Name    string    `json:"name,omitempty"`
+	Servers []*Server `json:"servers,omitempty"`
 }
 
 // FilterByIdxs returns a filtered server list filtered according to an index list
 func (sl *ServerList) FilterByIdxs(MessageServerIdxs []int) (filtered *ServerList, err error) {
-	filtered.Servers = []Server{}
+	filtered.Servers = []*Server{}
 	for _, i := range MessageServerIdxs {
 		if i > len(sl.Servers)-1 {
 			return nil, errors.New("requested server out of range of defined message servers")
@@ -31,22 +31,27 @@ func (sl *ServerList) GetServerByIdx(idx int) (server *Server, err error) {
 	if idx > len(sl.Servers)-1 {
 		return nil, errors.New("requested server out of range of defined message servers")
 	}
-	return &sl.Servers[idx], nil
+	return sl.Servers[idx], nil
 }
 
 // GetServerByPubkey returns a server from it's public key
 func (sl *ServerList) GetServerByPubkey(pubkey string) (filtered *Server) {
 	for _, srv := range sl.Servers {
 		if srv.PublicKey == pubkey {
-			return &srv
+			return srv
 		}
 	}
 	return nil
 }
 
 // AddUrls is a simple utility functon used mainly as a shortcut for testing purposes
-func (sl *ServerList) AddUrls(urls []string) {
+func (sl *ServerList) AddUrls(urls []string) error {
 	for _, url := range urls {
-		sl.Servers = append(sl.Servers, *CreateServerFromUrl(url))
+		srvnew, err := CreateServerFromUrl(url)
+		if err != nil {
+			return err
+		}
+		sl.Servers = append(sl.Servers, srvnew)
 	}
+	return nil
 }