Merge branch 'master' into patch-1

scionproto · Jul 31, 2023 · 809d2f9 · 809d2f9
2 parents 1337456 + 708bdc2
commit 809d2f9
Show file tree

Hide file tree

Showing 63 changed files with 13 additions and 8,181 deletions.
diff --git a/.golangcilint.yml b/.golangcilint.yml
@@ -73,14 +73,8 @@ issues:
     - path: pkg/scrypto/cms
       linters: [goheader]
 
-    # Exceptions to errcheck for some experimental colibri code and some old-ish convey tests.
+    # Exceptions to errcheck for some old-ish convey tests.
     - linters: [errcheck]
-      path: "^control/colibri/reservation/e2e/reservation_test.go$|\
-             ^control/colibri/reservation/index_test.go$|\
-             ^control/colibri/reservation/reservationdbtest/reservationdbtest.go$|\
-             ^control/colibri/reservation/segment/reservation_test.go$|\
-             ^control/colibri/reservation/sqlite/db_test.go$|\
-             ^control/colibri/reservationstore/store.go$|\
-             ^pkg/sock/reliable/reconnect/conn_io_test.go$|\
+      path: "^pkg/sock/reliable/reconnect/conn_io_test.go$|\
              ^pkg/sock/reliable/reconnect/network_test.go$|\
              ^pkg/sock/reliable/reconnect/reconnecter_test.go$"
diff --git a/control/colibri/reservation/BUILD.bazel b/control/colibri/reservation/BUILD.bazel
diff --git a/control/colibri/reservation/conf/BUILD.bazel b/control/colibri/reservation/conf/BUILD.bazel
diff --git a/control/colibri/reservation/conf/capacities.go b/control/colibri/reservation/conf/capacities.go
diff --git a/control/colibri/reservation/conf/capacities_test.go b/control/colibri/reservation/conf/capacities_test.go