From 1a57e492c415dfdd39d64154090c5d33ef0875d2 Mon Sep 17 00:00:00 2001
From: kuviman <kuviman@gmail.com>
Date: Thu, 8 Oct 2020 20:53:17 +0400
Subject: [PATCH] Make code work again

---
 app-src/Cargo.toml                                 |  9 ++++++---
 app-src/server.Dockerfile                          |  5 +++++
 .../src/bin/client_gen/rust/Cargo.toml.template    |  2 +-
 app-src/src/lib.rs                                 |  2 --
 app-src/src/model/mod.rs                           | 12 ++++++------
 app-src/test-config.json                           | 14 ++++++++++++++
 6 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 app-src/server.Dockerfile
 create mode 100644 app-src/test-config.json

diff --git a/app-src/Cargo.toml b/app-src/Cargo.toml
index 3c1bfd8..65af370 100644
--- a/app-src/Cargo.toml
+++ b/app-src/Cargo.toml
@@ -1,18 +1,21 @@
 [package]
 name = "aicup2019"
-version = "1.3.0"
+version = "1.3.1"
 authors = ["kuviman <kuviman@gmail.com>"]
 edition = "2018"
 default-run = "aicup2019"
 
+# [lib]
+# crate-type = ["cdylib"]
+
 [features]
 default = ["rendering"]
 rendering = ["codegame/rendering"]
 
 [dependencies]
-codegame = { git = "https://github.com/codeforces/codegame", default-features = false }
+codegame = { version = "0.3", default-features = false }
 serde = "1"
-trans-gen = { git = "https://github.com/kuviman/trans-gen" }
+trans-gen = "0.1"
 structopt = "0.3"
 
 [dev-dependencies]
diff --git a/app-src/server.Dockerfile b/app-src/server.Dockerfile
new file mode 100644
index 0000000..fae748b
--- /dev/null
+++ b/app-src/server.Dockerfile
@@ -0,0 +1,5 @@
+FROM debian
+
+RUN apt-get update && apt-get install -y libasound2 libgtk-3-0
+
+COPY aicup2019 aicup2019
\ No newline at end of file
diff --git a/app-src/src/bin/client_gen/rust/Cargo.toml.template b/app-src/src/bin/client_gen/rust/Cargo.toml.template
index 3c49330..355cb2c 100644
--- a/app-src/src/bin/client_gen/rust/Cargo.toml.template
+++ b/app-src/src/bin/client_gen/rust/Cargo.toml.template
@@ -5,4 +5,4 @@ edition = "2018"
 
 [dependencies]
 model = { path = "model", package = "aicup2019-model" }
-trans = { path = "model/trans" }
\ No newline at end of file
+trans = "0.1"
\ No newline at end of file
diff --git a/app-src/src/lib.rs b/app-src/src/lib.rs
index 21ae195..9ff4a99 100644
--- a/app-src/src/lib.rs
+++ b/app-src/src/lib.rs
@@ -349,8 +349,6 @@ pub fn run() {
         logger::init()
     }
     .expect("Failed to initialize logger");
-    #[cfg(feature = "rendering")]
-    logger::add_logger(Box::new(geng::logger()));
     add_translations(include_str!("translations.txt"));
     if let Some(lang) = &opt.lang {
         set_locale(lang);
diff --git a/app-src/src/model/mod.rs b/app-src/src/model/mod.rs
index ee60631..4855ed5 100644
--- a/app-src/src/model/mod.rs
+++ b/app-src/src/model/mod.rs
@@ -96,24 +96,24 @@ impl Default for ActionWrapper {
 }
 
 impl Trans for ActionWrapper {
-    fn read_from(mut reader: impl std::io::Read) -> std::io::Result<Self> {
-        let x = i32::read_from(&mut reader)?;
+    fn read_from(reader: &mut dyn std::io::Read) -> std::io::Result<Self> {
+        let x = i32::read_from(reader)?;
         Ok(match x {
             ActionWrapper::MAGIC => Self::V1 {
-                actions: Trans::read_from(&mut reader)?,
+                actions: Trans::read_from(reader)?,
             },
             _ => {
                 let mut actions = HashMap::new();
                 for _ in 0..x {
-                    let key = Id::read_from(&mut reader)?;
-                    let value = OldUnitAction::read_from(&mut reader)?;
+                    let key = Id::read_from(reader)?;
+                    let value = OldUnitAction::read_from(reader)?;
                     actions.insert(key, value);
                 }
                 Self::V0 { actions }
             }
         })
     }
-    fn write_to(&self, mut writer: impl std::io::Write) -> std::io::Result<()> {
+    fn write_to(&self, writer: &mut dyn std::io::Write) -> std::io::Result<()> {
         unimplemented!("Not used")
     }
 }
diff --git a/app-src/test-config.json b/app-src/test-config.json
new file mode 100644
index 0000000..0f34a5b
--- /dev/null
+++ b/app-src/test-config.json
@@ -0,0 +1,14 @@
+{
+    "options_preset": "Round1",
+    "players": [
+        "Quickstart",
+        {
+            "Tcp": {
+                "host": "0.0.0.0",
+                "port": 31001,
+                "accept_timeout": 30.0,
+                "timeout": 1.0
+            }
+        }
+    ]
+}
\ No newline at end of file