Merge pull request #14 from markya0616/return-keys

multiclient: return keys

Author: markya0616

multiclient/client.go

@@ -56,15 +56,15 @@ func New(ctx context.Context, opts ...Option) (*Client, error) {
 		}
 	}
 
-	clients := mc.rpcClientMap.Map()
-	lens := len(clients)
+	urls := mc.rpcClientMap.Keys()
+	lens := len(urls)
 	if lens == 0 {
 		return nil, ErrNoEthClient
 	}
 
 	log.Debug("Create multiclient", "urls", lens)
 	errCh := make(chan error, lens)
-	for rawURL := range clients {
+	for _, rawURL := range urls {
 		go func(ctx context.Context, rawURL string) {
 			ctx, cancel := context.WithTimeout(ctx, dialTimeout)
 			defer cancel()

multiclient/map.go

@@ -89,3 +89,16 @@ func (m *Map) Map() map[string]*rpc.Client {
 	}
 	return newMap
 }
+
+func (m *Map) Keys() []string {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+
+	urls := make([]string, len(m.m))
+	index := 0
+	for k := range m.m {
+		urls[index] = k
+		index++
+	}
+	return urls
+}