Update after Invercargill refactor

src/infra/daemon/riddled.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Riddle Daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/local/apache2/bin/httpd -D FOREGROUND -k start
+ExecReload=/usr/local/apache2/bin/httpd -k graceful
+Type=notify
+Restart=always
+
+
+[Install]
+WantedBy=default.target
+RequiredBy=network.target

src/infra/gen-domain/domain-gen.vala

@@ -9,7 +9,7 @@ public static int main(string[] args) {
     var key = args.length > 3 ? args[3] : DecentralisedNameInfo.generate_key();
     var expire = new DateTime.now_utc().add_days(1);
 
-    var props = new Invercargill.Sequence<NameProperty>();
+    var props = new Invercargill.Series<NameProperty>();
     props.add(new NameProperty(NamePropertyType.ADDRESS, ip, new string[0]));
 
     var info = new DecentralisedNameInfo(name, key, expire, props);

src/lib/Client.vala

@@ -1,13 +1,14 @@
 using Invercargill;
+using Invercargill.Convert;
 
 namespace Riddle {
 
     public class Client : Object {
 
-        private Invercargill.Sequence<PeerDiscoverer> discoverers = new Invercargill.Sequence<PeerDiscoverer> ();
-        private Invercargill.Sequence<InetSocketAddress> servers = new Invercargill.Sequence<InetSocketAddress>();
-        private Invercargill.Sequence<InetSocketAddress> local_servers = new Invercargill.Sequence<InetSocketAddress>();
-        private Invercargill.Sequence<Message> join_messages = new Invercargill.Sequence<Message>();
+        private Series<PeerDiscoverer> discoverers = new Series<PeerDiscoverer> ();
+        private Series<InetSocketAddress> servers = new Series<InetSocketAddress>();
+        private Series<InetSocketAddress> local_servers = new Series<InetSocketAddress>();
+        private Series<Message> join_messages = new Series<Message>();
         private InetSocketAddress? self_server = null;
 
         public Invercargill.Enumerable<InetSocketAddress> discovered_servers { get {
@@ -77,7 +78,7 @@ namespace Riddle {
             Enumerable<Message> j_msgs;
             lock(join_messages) {
                 servers.add(address);
-                j_msgs = join_messages.to_sequence();
+                j_msgs = join_messages.to_series();
             }
 
             foreach (var message in j_msgs) {
@@ -105,7 +106,7 @@ namespace Riddle {
 
         public int leave(string group, uint port) {
             lock(join_messages) {
-                join_messages = join_messages.where(m => m.arguments[0] != group && m.arguments[1] != port.to_string()).to_sequence();
+                join_messages = join_messages.where(m => m.arguments[0] != group && m.arguments[1] != port.to_string()).to_series();
             }
             var msg = new Message(MessageType.LEAVE, new string[] { group, port.to_string() }, new string[0]);
             var responses = raw_request(msg, servers, 10000, MessageType.OK);

src/lib/DaemonService.vala

@@ -6,13 +6,13 @@ namespace Riddle {
         private CallbackServer callback_server;
         private DBusService dbus_service;
         private Client client;
-        private Invercargill.Sequence<Riddle> riddles;
+        private Invercargill.Series<Riddle> riddles;
         private InetSocketAddress daemon_server_address;
 
         public DaemonService() throws Error {
             dbus_service = Bus.get_proxy_sync (BusType.SYSTEM, "nz.astrologue.RiddleService", "/nz/astrologue/RiddleService");
             client = new Client.with_dbus (dbus_service);
-            riddles = new Invercargill.Sequence<Riddle> ();
+            riddles = new Invercargill.Series<Riddle> ();
 
             
             var daemon_inet_address = new InetAddress.from_string (dbus_service.local_server_address());

src/lib/DecentralisedNameInfo.vala

@@ -60,7 +60,7 @@ namespace Riddle {
             this.name = name + generate_suffix(root_name, public_key);
             expires = expiry.to_utc();
             effective = new DateTime.now_utc();
-            this.properties = properties.to_sequence();
+            this.properties = properties.to_series();
 
             var data = stringify_base_info();
             var signed = Sodium.Asymmetric.Signing.sign (data.data, secret_key);

src/lib/FilesystemNameInfoStore.vala

@@ -58,7 +58,7 @@ namespace Riddle {
         }
         public override void clean() {
             var now = new DateTime.now_utc();
-            var names = get_all().to_sequence();
+            var names = get_all().to_series();
             foreach (var name in names) {
                 if(name.expires.difference(now) < 0) {
                     try {

src/lib/KnownHostDiscoverer.vala

@@ -2,11 +2,11 @@ namespace Riddle {
 
     public class KnownHostDiscoverer : PeerDiscoverer {
 
-        private Invercargill.Sequence<InetSocketAddress> peers;
+        private Invercargill.Series<InetSocketAddress> peers;
 
         public KnownHostDiscoverer() {
             // TODO read from config
-            peers = new Invercargill.Sequence<InetSocketAddress> ();
+            peers = new Invercargill.Series<InetSocketAddress> ();
         }
 
         protected override void discover_peers () {

src/lib/Message.vala

@@ -1,4 +1,5 @@
 using Invercargill;
+using Invercargill.Convert;
 
 namespace Riddle {
 
@@ -139,7 +140,7 @@ namespace Riddle {
         }
 
         public static async Message from_stream_async(DataInputStream stream) throws Error {
-            var lines = new Invercargill.Sequence<string>();
+            var lines = new Series<string>();
             var last_line = "";
             while(true) {
                 last_line = yield stream.read_line_async();
@@ -154,7 +155,7 @@ namespace Riddle {
 
 
         public static Message from_stream(DataInputStream stream) throws Error {
-            var lines = new Invercargill.Sequence<string>();
+            var lines = new Series<string>();
             var last_line = "";
             while(true) {
                 last_line = stream.read_line();

src/lib/NameInfo.vala

@@ -1,4 +1,5 @@
 using Invercargill;
+using Invercargill.Convert;
 
 namespace Riddle {
 
@@ -32,7 +33,7 @@ namespace Riddle {
             effective = new DateTime.from_iso8601(range[0], null);
             expires = new DateTime.from_iso8601(range[1], null);
 
-            var props = new Invercargill.Sequence<NameProperty>();
+            var props = new Series<NameProperty>();
             for(var i = 2; i < data.length; i++) {
                 props.add(new NameProperty.from_string(data[i]));
             }

src/lib/RequestManager.vala

@@ -4,7 +4,7 @@ namespace Riddle {
 
     internal class RequestManager {
 
-        private Invercargill.Sequence<Message> responses;
+        private Series<Message> responses;
         private Enumerable<InetSocketAddress> servers;
         private SocketClient socket_client;
 
@@ -15,8 +15,8 @@ namespace Riddle {
         private Mutex mutex = Mutex ();
 
         public RequestManager(Enumerable<InetSocketAddress> servers) {
-            this.servers = servers.to_sequence ();
-            responses = new Invercargill.Sequence<Message>();
+            this.servers = servers.to_series ();
+            responses = new Series<Message>();
             socket_client = new SocketClient();
         }
 
@@ -34,7 +34,7 @@ namespace Riddle {
             while(completed_threads < total_threads) {
                 cond.wait(mutex);
             }
-            var r = responses.where(r => r != null).to_sequence();
+            var r = responses.where(r => r != null).to_series();
             mutex.unlock();
             return r;
         }
@@ -47,7 +47,7 @@ namespace Riddle {
                     break;
                 }
             }
-            var r = responses.where(r => r != null).to_sequence();
+            var r = responses.where(r => r != null).to_series();
             mutex.unlock();
             return r;
         }
@@ -63,14 +63,14 @@ namespace Riddle {
                     cond.wait(mutex);
                 }
             }
-            var r = responses.where(r => r != null).to_sequence();
+            var r = responses.where(r => r != null).to_series();
             mutex.unlock();
             return r;
         }
 
         public Enumerable<Message> get_received_responses() {
             mutex.lock();
-            var r = responses.where(r => r != null).to_sequence();
+            var r = responses.where(r => r != null).to_series();
             mutex.unlock();
             return r;
         }

src/lib/Server.vala

@@ -13,7 +13,7 @@ namespace Riddle {
 
         
         private SocketService service;
-        private Gee.HashMap<string, Invercargill.Sequence<Registration>> registrations = new Gee.HashMap<string, Invercargill.Sequence<Registration>>();
+        private Gee.HashMap<string, Series<Registration>> registrations = new Gee.HashMap<string, Series<Registration>>();
         private Gee.HashMap<string, RiddleEnvelope> riddles = new Gee.HashMap<string, RiddleEnvelope>();
         private NameInfoStore names;
         public Client client { get; private set; }
@@ -271,10 +271,10 @@ namespace Riddle {
 
         private void cleanup_registrations() {
             lock(registrations) {
-                var copy = new Gee.HashMap<string, Invercargill.Sequence<Registration>>();
+                var copy = new Gee.HashMap<string, Series<Registration>>();
                 foreach (var group in registrations) {
                     var time = new DateTime.now_utc();
-                    copy.set(group.key, group.value.where(r => time.difference(r.timestamp) < REGISTRATION_TIMEOUT_US).to_sequence());
+                    copy.set(group.key, group.value.where(r => time.difference(r.timestamp) < REGISTRATION_TIMEOUT_US).to_series());
                 }
                 registrations = copy;
             }
@@ -288,7 +288,7 @@ namespace Riddle {
 
             lock(registrations) {
                 if(!registrations.has_key(group)) {
-                    registrations.set(group, new Invercargill.Sequence<Registration>());
+                    registrations.set(group, new Series<Registration>());
                 }
 
                 registrations[group].add(reg);
@@ -301,9 +301,9 @@ namespace Riddle {
 
         private void remove_registration(string group, InetSocketAddress address) {
             lock(registrations) {
-                Invercargill.Sequence<Registration> group_regs;
+                Series<Registration> group_regs;
                 registrations.unset(group, out group_regs);
-                registrations.set(group, group_regs.where(r => r.address.port != address.port || r.address.address.to_string() != address.address.to_string()).to_sequence());
+                registrations.set(group, group_regs.where(r => r.address.port != address.port || r.address.address.to_string() != address.address.to_string()).to_series());
             }
         }
 
@@ -312,7 +312,7 @@ namespace Riddle {
             lock(registrations) {
                 var regs = Invercargill.empty<Registration>();
                 if(registrations.has_key(group)) {
-                    regs = registrations[group].to_sequence();
+                    regs = registrations[group].to_series();
                 }
 
                 return regs;

src/lib/vapi/gnutls.vapi

@@ -753,8 +753,8 @@
          [CCode (cname = "gnutls_certificate_server_set_request")]
          public void set_certificate_request (CertificateRequest req);
  
-         [CCode (cname = "gnutls_certificate_send_x509_rdn_sequence")]
-         public void disable_sending_x509_rdn_sequence (bool disable);
+         [CCode (cname = "gnutls_certificate_send_x509_rdn_Series")]
+         public void disable_sending_x509_rdn_Series (bool disable);
  
          [CCode (cname = "gnutls_psk_server_get_username")]
          public unowned string get_psk_username ();