Acasă Explorează Ajutor
Autentificare
svi
/
wartank
1
0
Bifurcare 0
Fisiere Probleme 0 Trageți solicitările 0 Wiki
Răsfoiți Sursa

d06 Удалеение устаревших зависимостей

SVI 2 ani în urmă
părinte
ef76359d07
comite
1e1a037596
100 a modificat fișierele cu 295 adăugiri și 1056 ștergeri
Vizualizare divizată Arată Statisticile Diff
  1. 3 7
      Makefile
  2. 1 34
      README.md
  3. BIN
      cmd/desk.zip
  4. 0 17
      cmd/desk/main.go
  5. 1 1
      cmd/server/main.go
  6. 3 1
      doc/index.md
  7. 19 0
      doc/py_client.md
  8. 18 0
      doc/sound.md
  9. 1 25
      go.mod
  10. 0 675
      go.sum
  11. 0 36
      internal/desktop/desktop.go
  12. 4 4
      pkg/components/kernel/keeper/keeper_test.go
  13. 9 9
      pkg/components/kernel/kernel.go
  14. 3 3
      pkg/components/kernel/slog/slog_file/slog_file_test.go
  15. 0 0
      pkg/components/kernel/store/000001.log
  16. 1 0
      pkg/components/kernel/store/CURRENT
  17. 0 0
      pkg/components/kernel/store/LOCK
  18. 8 0
      pkg/components/kernel/store/LOG
  19. BIN
      pkg/components/kernel/store/MANIFEST-000000
  20. 66 56
      pkg/components/kernel/store/store.go
  21. 1 1
      pkg/components/parser_time/parse_min/parse_min.go
  22. 1 1
      pkg/components/parser_time/parse_sec/parse_sec.go
  23. 8 2
      pkg/components/parser_time/parse_sec/parse_sec_test.go
  24. 17 17
      pkg/mock/mock_env/mockenv.go
  25. 9 9
      pkg/mock/mock_env/mockenv_test.go
  26. 2 6
      pkg/mock/mockapp/mockapp.go
  27. 1 1
      pkg/mock/mockkernel/mockkernel.go
  28. 2 2
      pkg/scene/scene.go
  29. 1 1
      pkg/section/down_time/down_time.go
  30. 12 3
      pkg/section/down_time/down_time_test.go
  31. 1 1
      pkg/types/ibattle_action.go
  32. 0 9
      pkg/types/igui.go
  33. 1 1
      pkg/types/ikernel.go
  34. 10 10
      pkg/types/ikernel_store.go
  35. 2 2
      pkg/types/iscene.go
  36. 1 3
      pkg/types/iserver.go
  37. 0 27
      requiments.txt
  38. 0 0
      server/helper/helper.go
  39. 4 4
      server/serv_bots/dict_warbot/dict_warbot.go
  40. 3 3
      server/serv_bots/serv_bots.go
  41. 11 11
      server/serv_bots/warbot/angar/angar.go
  42. 0 0
      server/serv_bots/warbot/angar/angarnet/angarnet.go
  43. 4 7
      server/serv_bots/warbot/angar/base/arsenal/arsenal.go
  44. 0 0
      server/serv_bots/warbot/angar/base/arsenal/arsenalnet/arsenalnet.go
  45. 3 3
      server/serv_bots/warbot/angar/base/bank/bank.go
  46. 1 1
      server/serv_bots/warbot/angar/base/bank/bankmode/bankmode.go
  47. 0 0
      server/serv_bots/warbot/angar/base/bank/banknet/banknet.go
  48. 9 9
      server/serv_bots/warbot/angar/base/base.go
  49. 0 0
      server/serv_bots/warbot/angar/base/basenet/basenet.go
  50. 3 3
      server/serv_bots/warbot/angar/base/fuel/fuel.go
  51. 0 0
      server/serv_bots/warbot/angar/base/fuel/fuel_net/fuel_net.go
  52. 0 0
      server/serv_bots/warbot/angar/base/labor/labor.go
  53. 2 2
      server/serv_bots/warbot/angar/base/market/market.go
  54. 0 0
      server/serv_bots/warbot/angar/base/market/marketnet/marketnet.go
  55. 3 3
      server/serv_bots/warbot/angar/base/mine/mine.go
  56. 0 0
      server/serv_bots/warbot/angar/base/mine/minenet/minenet.go
  57. 3 3
      server/serv_bots/warbot/angar/base/polygon/polygon.go
  58. 0 0
      server/serv_bots/warbot/angar/base/polygon/polygonnet/polygonnet.go
  59. 3 3
      server/serv_bots/warbot/angar/battle/battle.go
  60. 0 0
      server/serv_bots/warbot/angar/battle/battle_register/battle_register.go
  61. 0 0
      server/serv_bots/warbot/angar/battle/battle_wait/battle_wait.go
  62. 4 4
      server/serv_bots/warbot/angar/battle/battle_worker/battle_worker.go
  63. 5 5
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/battleon.go
  64. 1 1
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/battlesound/battlesound.go
  65. 0 0
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/battlesound/isplay/isplay.go
  66. 1 1
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/health.go
  67. 0 0
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/healthtime/healthtime.go
  68. 0 0
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/isrepair/isrepair.go
  69. 0 0
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/repairtime/repairtime.go
  70. 0 0
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/manevr/ismanevr/ismanevr.go
  71. 3 3
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/manevr/manevr.go
  72. 0 0
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot/damage/damage.go
  73. 0 0
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot/isshot/isshot.go
  74. 1 1
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot/shot.go
  75. 0 0
      server/serv_bots/warbot/angar/battle/battle_worker/battleon/shottime/shottime.go
  76. 0 0
      server/serv_bots/warbot/angar/battle/battlenet/battlenet.go
  77. 0 0
      server/serv_bots/warbot/angar/battle/isrun/isrun.go
  78. 2 2
      server/serv_bots/warbot/angar/convoy/convoy.go
  79. 0 0
      server/serv_bots/warbot/angar/convoy/convoynet/convoynet.go
  80. 3 3
      server/serv_bots/warbot/angar/death_match/battle.go
  81. 0 0
      server/serv_bots/warbot/angar/death_match/battle_wait/battle_wait.go
  82. 0 0
      server/serv_bots/warbot/angar/death_match/death_net/death_net.go
  83. 0 0
      server/serv_bots/warbot/angar/death_match/death_register/death_register.go
  84. 1 1
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/battlesound/battlesound.go
  85. 0 0
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/battlesound/isplay/isplay.go
  86. 5 5
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/death_on.go
  87. 1 1
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/health/health.go
  88. 0 0
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/health/healthtime/healthtime.go
  89. 0 0
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/health/isrepair/isrepair.go
  90. 0 0
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/health/repairtime/repairtime.go
  91. 0 0
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/manevr/ismanevr/ismanevr.go
  92. 3 3
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/manevr/manevr.go
  93. 0 0
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot/damage/damage.go
  94. 0 0
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot/isshot/isshot.go
  95. 1 1
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot/shot.go
  96. 0 0
      server/serv_bots/warbot/angar/death_match/death_worker/death_on/shottime/shottime.go
  97. 4 4
      server/serv_bots/warbot/angar/death_match/death_worker/death_worker.go
  98. 0 0
      server/serv_bots/warbot/angar/death_match/isrun/isrun.go
  99. 1 1
      server/serv_bots/warbot/angar/division/division.go
  100. 4 4
      server/serv_bots/warbot/angar/division/divwar/divwar.go

+ 3 - 7
Makefile
Vizualizați fișierul 

@@ -37,10 +37,6 @@ prod.run:
 
 	go fmt ./...
 
 	go build -o ./bin/wartank ./cmd/server/main.go
 
 	./run_prod.sh
 
-desk.run:
 
-	clear
 
-	go fmt ./...
 
-	go build -o ./bin_dev/desktop ./cmd/desk/main.go
 
 test.run:
 
 	clear
 
 	go fmt ./...
 
@@ -49,12 +45,12 @@ test.run:
 
 mod:
 
 	clear
 
 	go get -u ./...
 
-	go mod tidy -compat=1.21.4
 
+	go mod tidy -compat=1.21.6
 
 	go mod vendor
 
 	go fmt ./...
 
 lint:
 
 	clear
 
 	go fmt ./...
 
-	golangci-lint run ./cmd/serv_old/...
 
-	golangci-lint run ./cmd/client_pwa/...
 
+	golangci-lint run ./cmd/server/...
 
+	golangci-lint run ./pkg/...
 
 	golangci-lint run ./internal/...

+ 1 - 34
README.md
Vizualizați fișierul 

@@ -6,22 +6,7 @@
 
 
 Пусть танк сам воюет, а вы ходите куда хотите.
 
 
-## Поддержка звука
 
-
 
-Консольный звук поддерживается только в `Linux`.
 
-Поддержка его вовсе необязательна, но при приближении битвы -- консольного звука не будет.
 
-В браузере звук будет производиться только если включена главная страница в браузере.
 
-
 
-Установка необходимого компонента (**Ubunutu**):
 
-
 
-```bash
 
-sudo apt-get install libasound2-dev
 
-```
 
-
 
-Компонент консольного бипера лежит вместе с основным пускачом в собранном виде
 
-(качать и собирать [вот отсюда](https://github.com/dbatbold/beep)).
 
-
 
-В комплекте консольный генератор звуков собран для `Ubuntu 20.04 LTS x64`.
 
+## Содержание
 
 
 ## Запуск
 
 
@@ -30,24 +15,6 @@ sudo apt-get install libasound2-dev
 
 - при работе: [localhost:18050](http://localhost:18050/)
 
 - при разработке: [localhost:18050](http://localhost:18060/)
 
 
-## Клиент
 
-
 
-Для работы клиента необходимо установить `python3.11` и к нему:
 
-
 
-```bash
 
-source ./venv/bin/activate
 
-python3 -m venv venv
 
-python3 -m pip install requests
 
-```
 
-
 
-## Обновление списка зависимостей
 
-
 
-Необходимо выполнять с активированным виртуальным окружением.
 
-
 
-```bash
 
-pip list > requiments.txt
 
-```
 
-
 
 ## Цели сборки
 
 
 ```bash

BIN
cmd/desk.zip
Vizualizați fișierul


+ 0 - 17
cmd/desk/main.go
Vizualizați fișierul 

@@ -1,17 +0,0 @@
 
-package main
 
-
 
-import (
 
-	"log"
 
-	"wartank/internal/desktop"
 
-)
 
-
 
-func main() {
 
-	log.Println("main(): desktop")
 
-	десктоп, ош := desktop.НовДесктоп()
 
-	if ош != nil {
 
-		log.Printf("main(): при создании десктопа, ош=%v\n", ош)
 
-	}
 
-	if ош := десктоп.Пуск(); ош != nil {
 
-		log.Printf("main(): при запуске десктопа, ош=%v\n", ош)
 
-	}
 
-}

+ 1 - 1
cmd/server/main.go
Vizualizați fișierul 

@@ -15,7 +15,7 @@ import (
 
 	"os"
 
 	"time"
 
 
-	"wartank/internal/server"
 
+	"wartank/server"
 
 )
 
 
 func profile() {

+ 3 - 1
doc/index.md
Vizualizați fișierul 

@@ -1 +1,3 @@
 
-# Документация wartank
 
+# Документация wartank
 
+
 
+ВарТанк -- автоматизация

+ 19 - 0
doc/py_client.md
Vizualizați fișierul 

@@ -0,0 +1,19 @@
 
+# клиент на питоне
 
+
 
+Для работы клиента необходимо установить `python3.11` и к нему:
 
+
 
+```bash
 
+source ./venv/bin/activate
 
+python3 -m venv venv
 
+python3 -m pip install requests
 
+```
 
+
 
+## Обновление списка зависимостей
 
+
 
+Необходимо выполнять с активированным виртуальным окружением.
 
+
 
+```bash
 
+pip list > requiments.txt
 
+```
 
+
 
+[< На главную](../README.md)

+ 18 - 0
doc/sound.md
Vizualizați fișierul 

@@ -0,0 +1,18 @@
 
+# Поддержка звука
 
+
 
+Консольный звук поддерживается только в `Linux`.
 
+Поддержка его вовсе необязательна, но при приближении битвы -- консольного звука не будет.
 
+В браузере звук будет производиться только если включена главная страница в браузере.
 
+
 
+Установка необходимого компонента (**Ubunutu**):
 
+
 
+```bash
 
+sudo apt-get install libasound2-dev
 
+```
 
+
 
+Компонент консольного бипера лежит вместе с основным пускачом в собранном виде
 
+(качать и собирать [вот отсюда](https://github.com/dbatbold/beep)).
 
+
 
+В комплекте консольный генератор звуков собран для `Ubuntu 20.04 LTS x64`.
 
+
 
+[< На главную](../README.md)

+ 1 - 25
go.mod
Vizualizați fișierul 

@@ -3,7 +3,6 @@ module wartank
 
 go 1.21.4
 
 
 require (
 
-	fyne.io/fyne/v2 v2.3.5
 
 	github.com/charmbracelet/bubbletea v0.25.0
 
 	github.com/gofiber/fiber/v2 v2.52.0
 
 	github.com/gofiber/template/html/v2 v2.1.0
 
@@ -12,27 +11,13 @@ require (
 
 )
 
 
 require (
 
-	fyne.io/systray v1.10.1-0.20231115130155-104f5ef7839e // indirect
 
 	github.com/andybalholm/brotli v1.1.0 // indirect
 
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 
 	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
 
-	github.com/davecgh/go-spew v1.1.1 // indirect
 
-	github.com/fredbi/uri v1.1.0 // indirect
 
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
 
-	github.com/fyne-io/gl-js v0.0.0-20230506162202-1fdaa286a934 // indirect
 
-	github.com/fyne-io/glfw-js v0.0.0-20240101223322-6e1efdc71b7a // indirect
 
-	github.com/fyne-io/image v0.0.0-20240119095650-e97186d4fe4a // indirect
 
-	github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect
 
-	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240118000515-a250818d05e3 // indirect
 
-	github.com/go-text/typesetting v0.1.0 // indirect
 
-	github.com/godbus/dbus/v5 v5.1.0 // indirect
 
 	github.com/gofiber/template v1.8.2 // indirect
 
 	github.com/gofiber/utils v1.1.0 // indirect
 
-	github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c // indirect
 
 	github.com/golang/snappy v0.0.4 // indirect
 
 	github.com/google/uuid v1.5.0 // indirect
 
-	github.com/gopherjs/gopherjs v1.17.2 // indirect
 
-	github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
 
 	github.com/klauspost/compress v1.17.4 // indirect
 
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 
 	github.com/mattn/go-colorable v0.1.13 // indirect
 
@@ -43,23 +28,14 @@ require (
 
 	github.com/muesli/cancelreader v0.2.2 // indirect
 
 	github.com/muesli/reflow v0.3.0 // indirect
 
 	github.com/muesli/termenv v0.15.2 // indirect
 
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 
 	github.com/rivo/uniseg v0.4.4 // indirect
 
-	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
 
-	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
 
-	github.com/stretchr/testify v1.8.4 // indirect
 
-	github.com/tevino/abool v1.2.0 // indirect
 
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 
 	github.com/valyala/fasthttp v1.51.0 // indirect
 
 	github.com/valyala/tcplisten v1.0.0 // indirect
 
-	github.com/yuin/goldmark v1.6.0 // indirect
 
-	golang.org/x/image v0.15.0 // indirect
 
-	golang.org/x/mobile v0.0.0-20240112133503-c713f31d574b // indirect
 
 	golang.org/x/net v0.20.0 // indirect
 
 	golang.org/x/sync v0.6.0 // indirect
 
 	golang.org/x/sys v0.16.0 // indirect
 
 	golang.org/x/term v0.16.0 // indirect
 
 	golang.org/x/text v0.14.0 // indirect
 
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 
-	honnef.co/go/js/dom v0.0.0-20231112215516-51f43a291193 // indirect
 
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 
 )

+ 0 - 675
go.sum
Vizualizați fișierul 

@@ -1,128 +1,15 @@
 
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
 
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
 
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
 
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
 
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
 
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
 
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
 
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
 
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
 
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
 
-cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
 
-cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
 
-cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
 
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 
-cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
 
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
 
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
 
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 
-fyne.io/fyne/v2 v2.3.5 h1:Q8WOtsms+esLrBKJGdj6P+klu+UXzRq63uPxFSQm4nc=
 
-fyne.io/fyne/v2 v2.3.5/go.mod h1:fbrL+kwOQ6sdVhnURktTHIRIEXwysQSLeejyFyABmNI=
 
-fyne.io/systray v1.10.1-0.20230602210930-b6a2d6ca2a7b/go.mod h1:oM2AQqGJ1AMo4nNqZFYU8xYygSBZkW2hmdJ7n4yjedE=
 
-fyne.io/systray v1.10.1-0.20231115130155-104f5ef7839e h1:Hvs+kW2VwCzNToF3FmnIAzmivNgrclwPgoUdVSrjkP8=
 
-fyne.io/systray v1.10.1-0.20231115130155-104f5ef7839e/go.mod h1:oM2AQqGJ1AMo4nNqZFYU8xYygSBZkW2hmdJ7n4yjedE=
 
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 
-github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 
-github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
 
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 
-github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
 
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 
 github.com/charmbracelet/bubbletea v0.25.0 h1:bAfwk7jRz7FKFl9RzlIULPkStffg5k6pNt5dywy4TcM=
 
 github.com/charmbracelet/bubbletea v0.25.0/go.mod h1:EN3QDR1T5ZdWmdfDzYcqOCAps45+QIJbLOBxmVNWNNg=
 
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 
 github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY=
 
 github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
 
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 
-github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 
-github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 
-github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
 
-github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
 
-github.com/fredbi/uri v0.1.0/go.mod h1:1xC40RnIOGCaQzswaOvrzvG/3M3F0hyDVb3aO/1iGy0=
 
-github.com/fredbi/uri v1.1.0 h1:OqLpTXtyRg9ABReqvDGdJPqZUxs8cyBDOMXBbskCaB8=
 
-github.com/fredbi/uri v1.1.0/go.mod h1:aYTUoAXBOq7BLfVJ8GnKmfcuURosB1xyHDIfWeC/iW4=
 
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 
-github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 
-github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe/go.mod h1:d4clgH0/GrRwWjRzJJQXxT/h1TyuNSfF/X64zb/3Ggg=
 
-github.com/fyne-io/gl-js v0.0.0-20230506162202-1fdaa286a934 h1:dZC5aKobSN07hf71oMivxUmAofFja5GrfPK2rBlttX4=
 
-github.com/fyne-io/gl-js v0.0.0-20230506162202-1fdaa286a934/go.mod h1:d4clgH0/GrRwWjRzJJQXxT/h1TyuNSfF/X64zb/3Ggg=
 
-github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504/go.mod h1:gLRWYfYnMA9TONeppRSikMdXlHQ97xVsPojddUv3b/E=
 
-github.com/fyne-io/glfw-js v0.0.0-20240101223322-6e1efdc71b7a h1:ybgRdYvAHTn93HW79bLiBiJwVL4jVeyGQRZMgImoeWs=
 
-github.com/fyne-io/glfw-js v0.0.0-20240101223322-6e1efdc71b7a/go.mod h1:gsGA2dotD4v0SR6PmPCYvS9JuOeMwAtmfvDE7mbYXMY=
 
-github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2/go.mod h1:eO7W361vmlPOrykIg+Rsh1SZ3tQBaOsfzZhsIOb/Lm0=
 
-github.com/fyne-io/image v0.0.0-20240119095650-e97186d4fe4a h1:+wTRuw25eyS8VJ6OndN13mtxP/NF9YbxYUi7tX7x5DI=
 
-github.com/fyne-io/image v0.0.0-20240119095650-e97186d4fe4a/go.mod h1:aX1w6epS9BQn2bePY+3rkQejetaffeFhXl0s8QjXJJk=
 
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 
-github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
 
-github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA=
 
-github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
 
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240118000515-a250818d05e3 h1:nanQfMsOs3gnuKRm0E5jXWomedE/9YIFXdmHJNZYeqc=
 
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240118000515-a250818d05e3/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 
-github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 
-github.com/go-text/typesetting v0.0.0-20230405155246-bf9c697c6e16/go.mod h1:zvWM81wAVW6QfVDI6yxfbCuoLnobSYTuMsrXU/u11y8=
 
-github.com/go-text/typesetting v0.1.0 h1:vioSaLPYcHwPEPLT7gsjCGDCoYSbljxoHJzMnKwVvHw=
 
-github.com/go-text/typesetting v0.1.0/go.mod h1:d22AnmeKq/on0HNv73UFriMKc4Ez6EqZAofLhAzpSzI=
 
-github.com/go-text/typesetting-utils v0.0.0-20230326210548-458646692de6/go.mod h1:RaqFwjcYyM5BjbYGwON0H5K0UqwO3sJlo9ukKha80ZE=
 
-github.com/go-text/typesetting-utils v0.0.0-20231211103740-d9332ae51f04 h1:zBx+p/W2aQYtNuyZNcTfinWvXBQwYtDfme051PR/lAY=
 
-github.com/go-text/typesetting-utils v0.0.0-20231211103740-d9332ae51f04/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
 
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 
-github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 
-github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 
 github.com/gofiber/fiber/v2 v2.52.0 h1:S+qXi7y+/Pgvqq4DrSmREGiFwtB7Bu6+QFLuIHYw/UE=
 
 github.com/gofiber/fiber/v2 v2.52.0/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ=
 
 github.com/gofiber/template v1.8.2 h1:PIv9s/7Uq6m+Fm2MDNd20pAFFKt5wWs7ZBd8iV9pWwk=
 
@@ -131,136 +18,20 @@ github.com/gofiber/template/html/v2 v2.1.0 h1:FjwzqhhdJpnhyCvav60Z1ytnBqOUr5sGO/
 
 github.com/gofiber/template/html/v2 v2.1.0/go.mod h1:txXsRQN/G7Fr2cqGfr6zhVHgreCfpsBS+9+DJyrddJc=
 
 github.com/gofiber/utils v1.1.0 h1:vdEBpn7AzIUJRhe+CiTOJdUcTg4Q9RK+pEa0KPbLdrM=
 
 github.com/gofiber/utils v1.1.0/go.mod h1:poZpsnhBykfnY1Mc0KeEa6mSHrS3dV0+oBWyeQmb2e0=
 
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 
-github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c h1:JGCm/+tJ9gC6THUxooTldS+CUDsba0qvkvU3DHklqW8=
 
-github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c/go.mod h1:wfqRWLHRBsRgkp5dmbG56SA0DmVtwrF5N3oPdI8t+Aw=
 
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 
-github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
 
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 
-github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 
-github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 
-github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 
-github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
 
-github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
 
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 
 github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
 
 github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 
-github.com/gopherjs/gopherjs v0.0.0-20211219123610-ec9572f70e60/go.mod h1:cz9oNYuRUWGdHmLF2IodMLkAhcPtXeULvcBNagUrxTI=
 
-github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
 
-github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
 
-github.com/goxjs/gl v0.0.0-20210104184919-e3fafc6f8f2a/go.mod h1:dy/f2gjY09hwVfIyATps4G2ai7/hLwLkc5TrPqONuXY=
 
-github.com/goxjs/glfw v0.0.0-20191126052801-d2efb5f20838/go.mod h1:oS8P8gVOT4ywTcjV6wZlOU4GuVFQ8F5328KY3MJ79CY=
 
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 
-github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 
-github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 
-github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 
-github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 
-github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
 
-github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 
-github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 
-github.com/jackmordaunt/icns/v2 v2.2.1/go.mod h1:6aYIB9eSzyfHHMKqDf17Xrs1zetQPReAkiUSHzdw4cI=
 
-github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY=
 
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 
-github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
 
-github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
 
-github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
 
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 
 github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
 
 github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 
-github.com/lucor/goinfo v0.0.0-20210802170112-c078a2b0f08b/go.mod h1:PRq09yoB+Q2OJReAmwzKivcYyremnibWGbK7WfftHzc=
 
-github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 
@@ -269,19 +40,6 @@ github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+Ei
 
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 
-github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2/go.mod h1:76rfSfYPWj01Z85hUf/ituArm797mNKcvINh1OlsZKo=
 
-github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 
-github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 
-github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 
-github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 
-github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 
-github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
 
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
 
@@ -290,490 +48,57 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
 
 github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
 
 github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
 
-github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 
-github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 
 github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
 
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 
 github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 
-github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 
-github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
 
-github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
 
-github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 
-github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
 
-github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
 
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 
-github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 
-github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 
-github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 
-github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk=
 
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 
-github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 
-github.com/srwiley/oksvg v0.0.0-20220731023508-a61f04f16b76/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
 
-github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE=
 
-github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
 
-github.com/srwiley/rasterx v0.0.0-20210519020934-456a8d69b780/go.mod h1:mvWM0+15UqyrFKqdRjY6LuAVJR0HOVhJlEgZ5JWtSWU=
 
-github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ=
 
-github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE=
 
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 
-github.com/tevino/abool v1.2.0 h1:heAkClL8H6w+mK5md9dzsuohKeXHUpY7Vw0ZCKW+huA=
 
-github.com/tevino/abool v1.2.0/go.mod h1:qc66Pna1RiIsPa7O4Egxxs9OqkuxDX55zznh9K07Tzg=
 
-github.com/urfave/cli/v2 v2.4.0/go.mod h1:NX9W0zmTvedE5oDoOMs2RTC8RvdK98NTYZE5LbaEYPg=
 
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 
 github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1SqA=
 
 github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g=
 
 github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
 
 github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
 
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 
-github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 
-github.com/yuin/goldmark v1.6.0 h1:boZcn2GTjpsynOsC0iJHnBWa4Bi0qzfJjthwauItG68=
 
-github.com/yuin/goldmark v1.6.0/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 
-go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 
-go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 
-go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
 
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 
-go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 
-golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 
-golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
 
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
 
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
 
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 
-golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 
-golang.org/x/image v0.3.0/go.mod h1:fXd9211C/0VTlYuAcOhW8dY/RtEJqODXOWBDpmYBf+A=
 
-golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
 
-golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
 
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
 
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 
-golang.org/x/mobile v0.0.0-20211207041440-4e6c2922fdee/go.mod h1:pe2sM7Uk+2Su1y7u/6Z8KJ24D7lepUjFZbhFOrmDfuQ=
 
-golang.org/x/mobile v0.0.0-20240112133503-c713f31d574b h1:kfWLZgb8iUBHdE9WydD5V5dHIS/F6HjlBZNyJfn2bs4=
 
-golang.org/x/mobile v0.0.0-20240112133503-c713f31d574b/go.mod h1:4efzQnuA1nICq6h4kmZRMGzbPiP06lZvgADUu1VpJCE=
 
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
-golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 
-golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 
 golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
 
 golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 
-golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 
-golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 
-golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
 golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
 
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
-golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 
 golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
 
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 
 golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
 
 golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
 
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
-golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
 
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 
-golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
 
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
 
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
 
-google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
 
-google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
 
-google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8=
 
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
 
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
 
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
-google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
-google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
-google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
-google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
-google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
 
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
 
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 
-google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 
-google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 
-gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 
-honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2/go.mod h1:sUMDUKNB2ZcVjt92UnLy3cdGs+wDAcrPdV3JP6sVgA4=
 
-honnef.co/go/js/dom v0.0.0-20231112215516-51f43a291193 h1:BST3Y7yWfYPO8qqWhL2KtuqgRCbls6bIr4b4iFCg43I=
 
-honnef.co/go/js/dom v0.0.0-20231112215516-51f43a291193/go.mod h1:sUMDUKNB2ZcVjt92UnLy3cdGs+wDAcrPdV3JP6sVgA4=
 
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

+ 0 - 36
internal/desktop/desktop.go
Vizualizați fișierul 

@@ -1,36 +0,0 @@
 
-// package desktop -- пускач для приложения
 
-package desktop
 
-
 
-import (
 
-	"log"
 
-
 
-	"fyne.io/fyne/v2"
 
-	"fyne.io/fyne/v2/app"
 
-	"fyne.io/fyne/v2/widget"
 
-)
 
-
 
-// Десктоп -- главный тип приложения
 
-type Десктоп struct {
 
-	приложение fyne.App
 
-	окноГлав   fyne.Window
 
-}
 
-
 
-// НовДесктоп -- возвращает новый объект десктопа
 
-func НовДесктоп() (*Десктоп, error) {
 
-	log.Println("НовДесктоп()")
 
-
 
-	сам := &Десктоп{
 
-		приложение: app.New(),
 
-	}
 
-	сам.окноГлав = сам.приложение.NewWindow("Hello World")
 
-	сам.окноГлав.SetContent(widget.NewLabel("Hello World!"))
 
-	return сам, nil
 
-}
 
-
 
-// Пуск -- запускает десктоп в работу
 
-func (сам *Десктоп) Пуск() error {
 
-	log.Println("Пуск()")
 
-	сам.окноГлав.Show()
 
-	сам.приложение.Run()
 
-	return nil
 
-}

+ 4 - 4
pkg/components/kernel/keeper/keeper_test.go
Vizualizați fișierul 

@@ -7,7 +7,7 @@ import (
 
 	"time"
 
 
 	"wartank/pkg/components/kernel/slog"
 
-	"wartank/pkg/mock/mockenv"
 
+	"wartank/pkg/mock/mock_env"
 
 	"wartank/pkg/mock/mockkernel"
 
 	"wartank/pkg/types"
 
 )
 
@@ -20,7 +20,7 @@ import (
 
 type tester struct {
 
 	t    *testing.T
 
 	err  error
 
-	me   *mockenv.MockEnv
 
+	me   *mock_env.МокОкружение
 
 	kp   *Keeper
 
 	kern types.ИЯдро
 
 }
 
@@ -28,7 +28,7 @@ type tester struct {
 
 func TestKeeper(t *testing.T) {
 
 	test := &tester{
 
 		t:  t,
 
-		me: mockenv.NewMockEnv(),
 
+		me: mock_env.НовМокОкружение(),
 
 	}
 
 	test.create()
 
 	test.cancel()
 
@@ -57,7 +57,7 @@ func (сам *tester) createGood1() {
 
 		}
 
 	}()
 
 	сам.me.Unset()
 
-	if err := сам.me.InitLocal(); err != nil {
 
+	if err := сам.me.ИнитЛокал(); err != nil {
 
 		сам.t.Errorf("createGood1(): не локальное окружение, err=\n\t%v\n", err)
 
 		return
 
 	}

+ 9 - 9
pkg/components/kernel/kernel.go
Vizualizați fișierul 

@@ -21,13 +21,13 @@ import (
 
 
 // Ядро -- объект ядра приложения
 
 type Ядро struct {
 
-	ctxBg    context.Context // Неотменяемый контекст приложения
 
-	ctxApp   context.Context // Отменяемый контекст приложения
 
-	fnCancel func()          // Функция отмены приложения
 
-	keeper   *keeper.Keeper  // Сторож системных сигналов
 
-	слог     *slog.Slog      // Логгер в два вывода
 
-	wg       *wgname.WgName  // Групповое ожидание частей приложения
 
-	хран     types.ИХран     // Хранилище данных
 
+	ctxBg    context.Context  // Неотменяемый контекст приложения
 
+	ctxApp   context.Context  // Отменяемый контекст приложения
 
+	fnCancel func()           // Функция отмены приложения
 
+	keeper   *keeper.Keeper   // Сторож системных сигналов
 
+	слог     *slog.Slog       // Логгер в два вывода
 
+	wg       *wgname.WgName   // Групповое ожидание частей приложения
 
+	хран     types.ИХранилище // Хранилище данных
 
 	блок     sync.Mutex
 
 }
 
 
@@ -41,7 +41,7 @@ func НовЯдро() (types.ИЯдро, error) {
 
 	}
 
 	var ош error
 
 	сам.ctxApp, сам.fnCancel = context.WithCancel(сам.ctxBg)
 
-	сам.хран, ош = store.NewStore(сам, "./store")
 
+	сам.хран, ош = store.НовХранилище(сам, "./store")
 
 	if ош != nil {
 
 		return nil, fmt.Errorf("НовЯдро(): in creste IStore, err=%w", ош)
 
 	}
 
@@ -57,7 +57,7 @@ func НовЯдро() (types.ИЯдро, error) {
 
 }
 
 
 // Store -- возвращает хранилище данных
 
-func (сам *Ядро) Store() types.ИХран {
 
+func (сам *Ядро) Store() types.ИХранилище {
 
 	return сам.хран
 
 }

+ 3 - 3
pkg/components/kernel/slog/slog_file/slog_file_test.go
Vizualizați fișierul 

@@ -5,7 +5,7 @@ import (
 
 	"testing"
 
 	"time"
 
 
-	"wartank/pkg/mock/mockenv"
 
+	"wartank/pkg/mock/mock_env"
 
 	"wartank/pkg/mock/mockkernel"
 
 	"wartank/pkg/types"
 
 )
 
@@ -17,7 +17,7 @@ import (
 
 type tester struct {
 
 	t    *testing.T
 
 	err  error
 
-	me   *mockenv.MockEnv
 
+	me   *mock_env.МокОкружение
 
 	kern types.ИЯдро
 
 	сам  *SlogFile
 
 }
 
@@ -26,7 +26,7 @@ func TestSlogFile(t *testing.T) {
 
 	_ = os.RemoveAll("./log")
 
 	test := &tester{
 
 		t:  t,
 
-		me: mockenv.NewMockEnv(),
 
+		me: mock_env.НовМокОкружение(),
 
 	}
 
 	test.create()
 
 	test.write()

+ 0 - 0
pkg/components/kernel/store/000001.log
Vizualizați fișierul


+ 1 - 0
pkg/components/kernel/store/CURRENT
Vizualizați fișierul 

@@ -0,0 +1 @@
 
+MANIFEST-000000

+ 0 - 0
pkg/components/kernel/store/LOCK
Vizualizați fișierul


+ 8 - 0
pkg/components/kernel/store/LOG
Vizualizați fișierul 

@@ -0,0 +1,8 @@
 
+=============== Jan 19, 2024 (MSK) ===============
 
+15:59:38.249408 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
 
+15:59:38.274079 db@open opening
 
+15:59:38.278624 version@stat F·[] S·0B[] Sc·[]
 
+15:59:38.284272 db@janitor F·2 G·0
 
+15:59:38.284710 db@open done T·10.417468ms
 
+15:59:38.293954 db@close closing
 
+15:59:38.294341 db@close done T·164.877µs

BIN
pkg/components/kernel/store/MANIFEST-000000
Vizualizați fișierul


+ 66 - 56
pkg/components/kernel/store/store.go
Vizualizați fișierul 

@@ -13,124 +13,134 @@ import (
 
 	"wartank/pkg/types"
 
 )
 
 
-// Store -- главный тип плагина хранилища
 
-type Store struct {
 
+const (
 
+	стрХранилище = "Хранилище"
 
+)
 
+
 
+// Хранилище -- главный тип плагина хранилища
 
+type Хранилище struct {
 
 	ядро   types.ИЯдро
 
 	path   string              // Путь к хранилищу
 
 	isWork *safe_bool.БезопБул // Признак открытой базы
 
-	db     *leveldb.DB         // Объект хранилища
 
+	бд     *leveldb.DB         // Объект хранилища
 
 	block  sync.Mutex          // Блокировка для безопасности потоков
 
 }
 
 
-// NewStore -- возвращает новое хранилище
 
-func NewStore(ядро types.ИЯдро, path string) (*Store, error) {
 
+// НовХранилище -- возвращает новое хранилище
 
+func НовХранилище(ядро types.ИЯдро, path string) (*Хранилище, error) {
 
 	{ // Прдусловия
 
 		if ядро == nil {
 
-			return nil, fmt.Errorf("NewStore: ядро == nil")
 
+			return nil, fmt.Errorf("НовХранилище: ядро == nil")
 
 		}
 
 		if path == "" {
 
-			return nil, fmt.Errorf("NewStore: path == nil")
 
+			return nil, fmt.Errorf("НовХранилище: path == nil")
 
 		}
 
 	}
 
-	sf := &Store{
 
+	сам := &Хранилище{
 
 		ядро:   ядро,
 
 		path:   path,
 
 		isWork: safe_bool.НовБезопБул(),
 
 	}
 
-	if err := sf.open(); err != nil {
 
-		return nil, fmt.Errorf("NewStore: in open db, err=\n\t%w", err)
 
+	if err := сам.открыть(); err != nil {
 
+		return nil, fmt.Errorf("НовХранилище: при открытии БД, err=\n\t%w", err)
 
+	}
 
+	if ош := ядро.Wg().Add(стрХранилище); ош != nil {
 
+		return nil, fmt.Errorf("НовХранилище: при добавлении группы ожидания, ош=\n\t%v", ош)
 
 	}
 
-	ядро.Wg().Add("ядро")
 
-	return sf, nil
 
+	_ = types.ИХранилище(сам)
 
+	return сам, nil
 
 }
 
 
-// Put -- добавляет в хранилище значение по ключу
 
-func (sf *Store) Put(key string, value []byte) error {
 
-	sf.block.Lock()
 
-	defer sf.block.Unlock()
 
-	if key == "" {
 
-		return fmt.Errorf("Store.Put(): key is empty")
 
+// Уст -- добавляет в хранилище значение по ключу
 
+func (сам *Хранилище) Уст(ключ string, знач []byte) error {
 
+	сам.block.Lock()
 
+	defer сам.block.Unlock()
 
+	if ключ == "" {
 
+		return fmt.Errorf("Хранилище.Уст(): ключ пустой")
 
 	}
 
-	if value == nil {
 
-		return fmt.Errorf("Store.Put(): value == nil")
 
+	if знач == nil {
 
+		return fmt.Errorf("Хранилище.Уст(): знач == nil")
 
 	}
 
-	if err := sf.db.Put([]byte(key), value, nil); err != nil {
 
-		return fmt.Errorf("Store.Put(): in put value, err=\n\t%w", err)
 
+	if ош := сам.бд.Put([]byte(ключ), знач, nil); ош != nil {
 
+		return fmt.Errorf("Хранилище.Уст(): при устнановке значения, ош=\n\t%w", ош)
 
 	}
 
 	return nil
 
 }
 
 
-// Get -- возвращает значение по ключу
 
-func (sf *Store) Get(key string) ([]byte, error) {
 
+// Получ -- возвращает значение по ключу
 
+func (sf *Хранилище) Получ(key string) ([]byte, error) {
 
 	sf.block.Lock()
 
 	defer sf.block.Unlock()
 
-	value, err := sf.db.Get([]byte(key), nil)
 
+	value, err := sf.бд.Get([]byte(key), nil)
 
 	if err != nil {
 
-		return nil, fmt.Errorf("Store.Get(): in get value, err=\n\t%w", err)
 
+		return nil, fmt.Errorf("Хранилище.Get(): in get value, err=\n\t%w", err)
 
 	}
 
 	return value, nil
 
 }
 
 
-// Find -- возвращает список ключей по префиксу
 
-func (sf *Store) Find(prefix string) ([]string, error) {
 
+// Найти -- возвращает список ключей по префиксу
 
+func (sf *Хранилище) Найти(prefix string) ([]string, error) {
 
 	sf.block.Lock()
 
 	defer sf.block.Unlock()
 
 	var keys []string
 
 	slice := &util.Range{Start: []byte(prefix)}
 
-	iter := sf.db.NewIterator(slice, nil)
 
+	iter := sf.бд.NewIterator(slice, nil)
 
 	for iter.Next() {
 
 		key := string(iter.Key())
 
 		keys = append(keys, key)
 
 	}
 
 	iter.Release()
 
 	if err := iter.Error(); err != nil {
 
-		return nil, fmt.Errorf("Store.Find(): in find keys, err=\n\t%w", err)
 
+		return nil, fmt.Errorf("Хранилище.Find(): in find keys, err=\n\t%w", err)
 
 	}
 
 	return keys, nil
 
 }
 
 
-// Del -- удаляет значение по ключу
 
-func (sf *Store) Del(key string) error {
 
+// Удалить -- удаляет значение по ключу
 
+func (sf *Хранилище) Удалить(key string) error {
 
 	sf.block.Lock()
 
 	defer sf.block.Unlock()
 
-	if err := sf.db.Delete([]byte(key), nil); err != nil {
 
-		return fmt.Errorf("Store.Del(): in delete key, err=\n\t%w", err)
 
+	if err := sf.бд.Delete([]byte(key), nil); err != nil {
 
+		return fmt.Errorf("Хранилище.Del(): in delete key, err=\n\t%w", err)
 
 	}
 
 	return nil
 
 }
 
 
-// open -- открывает хранилище
 
-func (sf *Store) open() error {
 
-	sf.block.Lock()
 
-	defer sf.block.Unlock()
 
-	db, err := leveldb.OpenFile(sf.path, nil)
 
-	fnOpen := func() {
 
-		sf.db = db
 
-		sf.isWork.Уст()
 
-		go sf.close()
 
-	}
 
-	if err == nil {
 
-		fnOpen()
 
+// открыть -- открывает хранилище
 
+func (сам *Хранилище) открыть() error {
 
+	сам.block.Lock()
 
+	defer сам.block.Unlock()
 
+	бд, ош := leveldb.OpenFile(сам.path, nil)
 
+	фнОткрыть := func() {
 
+		сам.бд = бд
 
+		сам.isWork.Уст()
 
+		go сам.закрыть()
 
+	}
 
+	if ош == nil {
 
+		фнОткрыть()
 
 		return nil
 
 	}
 
-	log.Printf("Store.open(): try restore db, in open err=\n\t%v", err)
 
-	db, err = leveldb.RecoverFile(sf.path, nil)
 
-	if err != nil {
 
-		return fmt.Errorf("Store.open(): in recover db, err=\n\t%w", err)
 
+	log.Printf("Хранилище.открыть(): при открытии БД, ош=\n\t%v", ош)
 
+	бд, ош = leveldb.RecoverFile(сам.path, nil)
 
+	if ош != nil {
 
+		return fmt.Errorf("Хранилище.открыть(): при попытке восстановлении БД, ош=\n\t%w", ош)
 
 	}
 
-	fnOpen()
 
+	фнОткрыть()
 
 	return nil
 
 }
 
 
-// close -- закрывает хранилище по требованию
 
-func (sf *Store) close() {
 
+// закрыть -- закрывает хранилище по требованию
 
+func (sf *Хранилище) закрыть() {
 
 	<-sf.ядро.CtxApp().Done()
 
 	sf.block.Lock()
 
 	defer sf.block.Unlock()
 
 	sf.isWork.Сброс()
 
-	if err := sf.db.Close(); err != nil {
 
-		log.Printf("Store.close(): in close db, err=\n\t%v", err)
 
+	if err := sf.бд.Close(); err != nil {
 
+		log.Printf("Хранилище.закрыть(): при закрытти БД, err=\n\t%v", err)
 
 		return
 
 	}
 
-	sf.ядро.Wg().Done("ядро")
 
+	ош := sf.ядро.Wg().Done(стрХранилище)
 
+	if ош != nil {
 
+		log.Printf("Хранилище.закрыть(): при удалении группы ожидания, ош=\n\t%v", ош)
 
+	}
 
 }

+ 1 - 1
pkg/components/parser_time/parse_min/parse_min.go
Vizualizați fișierul 

@@ -79,7 +79,7 @@ func (сам *ПарсерМинут) УстМин(цМин alias.Мин) error
 
 
 // Внтренняя установка минут
 
 func (сам *ПарсерМинут) уст(цМин alias.Мин) error {
 
-	if !(0 <= цМин && цМин < 60) {
 
+	if цМин >= 60 {
 
 		return fmt.Errorf("ПарсерМинут.set(): минуты не в диапазоне(%v) 0..60", цМин)
 
 	}
 
 	сам.знач = цМин

+ 1 - 1
pkg/components/parser_time/parse_sec/parse_sec.go
Vizualizați fișierul 

@@ -79,7 +79,7 @@ func (сам *ПарсерСекунд) УстСек(цСек alias.Сек) erro
 
 
 // Внутренняя установка значения секунд
 
 func (сам *ПарсерСекунд) уст(цСек alias.Сек) error {
 
-	if !(0 <= цСек && цСек < 60) {
 
+	if цСек >= 60 {
 
 		return fmt.Errorf("ПарсерСекунд.уст(): секунды(%v) не в диапазоне 0..60", цСек)
 
 	}
 
 	сам.знач = цСек

+ 8 - 2
pkg/components/parser_time/parse_sec/parse_sec_test.go
Vizualizați fișierul 

@@ -67,7 +67,10 @@ func (сам *tester) parseGood2() {
 
 			сам.t.Errorf("parseGood2(): panic=\n\t%v\n", _panic)
 
 		}
 
 	}()
 
-	сам.ph.Уст("59")
 
+	ош := сам.ph.Уст("59")
 
+	if ош != nil {
 
+		сам.t.Errorf("parseGood2(): ош=\n\t%v\n", ош)
 
+	}
 
 	if strHour := сам.ph.String(); strHour != "59" {
 
 		сам.t.Errorf("parseGood2(): strHour(%q)!='867'\n", strHour)
 
 	}
 
@@ -81,7 +84,10 @@ func (сам *tester) parseGood1() {
 
 			сам.t.Errorf("parseGood1(): panic=\n\t%v\n", _panic)
 
 		}
 
 	}()
 
-	сам.ph.Уст("8")
 
+	ош := сам.ph.Уст("8")
 
+	if ош != nil {
 
+		сам.t.Errorf("parseGood1(): ош=\n\t%v\n", ош)
 
+	}
 
 	if strHour := сам.ph.String(); strHour != "08" {
 
 		сам.t.Errorf("parseGood1(): strHour(%q)!='08'\n", strHour)
 
 	}

+ 17 - 17
pkg/mock/mockenv/mockenv.go → pkg/mock/mock_env/mockenv.go
Vizualizați fișierul 

@@ -1,8 +1,8 @@
 
-package mockenv
 
+// package mock_env -- vjr-jrhe;tybt lkz ntcnjd
 
+package mock_env
 
 
 import (
 
 	"fmt"
 
-	"io/ioutil"
 
 	"os"
 
 	"strings"
 
 )
 
@@ -20,21 +20,21 @@ var (
 
 	fileEnv  = ".env"
 
 )
 
 
-// MockEnv -- мок-объект для переменных окружения
 
-type MockEnv struct {
 
+// МокОкружение -- мок-объект для переменных окружения
 
+type МокОкружение struct {
 
 	dict map[string]string
 
 }
 
 
-// NewMockEnv -- возвращает новый *MockEnv
 
-func NewMockEnv() *MockEnv {
 
-	сам := &MockEnv{
 
+// НовМокОкружение -- возвращает новый *MockEnv
 
+func НовМокОкружение() *МокОкружение {
 
+	сам := &МокОкружение{
 
 		dict: make(map[string]string),
 
 	}
 
 	return сам
 
 }
 
 
-// InitFake -- инициализация фейковыми данными
 
-func (сам *MockEnv) InitFake() {
 
+// ИнитФейк -- инициализация фейковыми данными
 
+func (сам *МокОкружение) ИнитФейк() {
 
 	сам.dict = make(map[string]string)
 
 	i := 0
 
 	for _, var_ := range vars {
 
@@ -50,8 +50,8 @@ func (сам *MockEnv) InitFake() {
 
 	}
 
 }
 
 
-// InitLocal -- читает из локального окружения файл, заполняет переменные
 
-func (сам *MockEnv) InitLocal() error {
 
+// ИнитЛокал -- читает из локального окружения файл, заполняет переменные
 
+func (сам *МокОкружение) ИнитЛокал() error {
 
 	strData, err := сам.readFile()
 
 	if err != nil {
 
 		return fmt.Errorf("MockEnv.InitLocal(): при чтении файла, err=\n\t%w", err)
 
@@ -67,7 +67,7 @@ func (сам *MockEnv) InitLocal() error {
 
 }
 
 
 // Проверяет наличие поля STAGE
 
-func (сам *MockEnv) checkStage() {
 
+func (сам *МокОкружение) checkStage() {
 
 	stage, ok := сам.dict["STAGE"]
 
 	if !ok {
 
 		panic(fmt.Errorf("MockEnv.checkStage(): не установлена переменная STAGE"))
 
@@ -78,7 +78,7 @@ func (сам *MockEnv) checkStage() {
 
 }
 
 
 // Инициализирует все заданные переменные окружения
 
-func (сам *MockEnv) initEnv(mapEnv map[string]string) {
 
+func (сам *МокОкружение) initEnv(mapEnv map[string]string) {
 
 	// Здесь не должен быть nil НИКОГДА
 
 	for key, value := range mapEnv {
 
 		os.Unsetenv(key)
 
@@ -87,7 +87,7 @@ func (сам *MockEnv) initEnv(mapEnv map[string]string) {
 
 }
 
 
 // Готовит словарь значений
 
-func (сам *MockEnv) getPairs(strData string) (map[string]string, error) {
 
+func (сам *МокОкружение) getPairs(strData string) (map[string]string, error) {
 
 	lstData := strings.Split(strData, "\n")
 
 	mapEnv := make(map[string]string)
 
 	for _, line := range lstData {
 
@@ -116,7 +116,7 @@ func (сам *MockEnv) getPairs(strData string) (map[string]string, error) {
 
 }
 
 
 // Читает файл окружения
 
-func (сам *MockEnv) readFile() (string, error) {
 
+func (сам *МокОкружение) readFile() (string, error) {
 
 	if !strings.Contains(path, selfPath) {
 
 		return "", fmt.Errorf("MockEnv.readFile(): неправильный путь проекта")
 
 	}
 
@@ -127,7 +127,7 @@ func (сам *MockEnv) readFile() (string, error) {
 
 	}
 
 	pt = lstPath[0]
 
 	fileName := pt + selfPath + fileEnv
 
-	binData, err := ioutil.ReadFile(fileName)
 
+	binData, err := os.ReadFile(fileName)
 
 	if err != nil {
 
 		return "", fmt.Errorf("MockEnv.readFile(): при чтении файла %q .env, err=%w", fileName, err)
 
 	}
 
@@ -135,7 +135,7 @@ func (сам *MockEnv) readFile() (string, error) {
 
 }
 
 
 // Unset -- удаляет все переменные окружения сервиса
 
-func (сам *MockEnv) Unset() {
 
+func (сам *МокОкружение) Unset() {
 
 	for key := range сам.dict {
 
 		os.Unsetenv(key)
 
 	}

+ 9 - 9
pkg/mock/mockenv/mockenv_test.go → pkg/mock/mock_env/mockenv_test.go
Vizualizați fișierul 

@@ -1,4 +1,4 @@
 
-package mockenv
 
+package mock_env
 
 
 import (
 
 	"testing"
 
@@ -11,7 +11,7 @@ import (
 
 // Тестер для переменных окружения
 
 type tester struct {
 
 	t  *testing.T
 
-	me *MockEnv
 
+	me *МокОкружение
 
 }
 
 
 func TestMockEnv(t *testing.T) {
 
@@ -68,7 +68,7 @@ func (сам *tester) initLocal() {
 
 }
 
 
 func (сам *tester) initLocalGood1() {
 
-	if err := сам.me.InitLocal(); err != nil {
 
+	if err := сам.me.ИнитЛокал(); err != nil {
 
 		сам.t.Errorf("initLocalGood1(): err=\n\t%v\n", err)
 
 	}
 
 }
 
@@ -77,7 +77,7 @@ func (сам *tester) initLocalGood1() {
 
 func (сам *tester) initLocalBad4() {
 
 	_fileEnv := fileEnv
 
 	fileEnv = "./test_data/env_bad2"
 
-	if err := сам.me.InitLocal(); err == nil {
 
+	if err := сам.me.ИнитЛокал(); err == nil {
 
 		сам.t.Errorf("initLocalBad4(): err==nil\n")
 
 	}
 
 	fileEnv = _fileEnv
 
@@ -87,7 +87,7 @@ func (сам *tester) initLocalBad4() {
 
 func (сам *tester) initLocalBad3() {
 
 	_fileEnv := fileEnv
 
 	fileEnv = "./test_data/env_bad1"
 
-	if err := сам.me.InitLocal(); err == nil {
 
+	if err := сам.me.ИнитЛокал(); err == nil {
 
 		сам.t.Errorf("initLocalBad3(): err==nil\n")
 
 	}
 
 	fileEnv = _fileEnv
 
@@ -97,7 +97,7 @@ func (сам *tester) initLocalBad3() {
 
 func (сам *tester) initLocalBad2() {
 
 	_fileEnv := fileEnv
 
 	fileEnv = "./test_data/env_bad"
 
-	if err := сам.me.InitLocal(); err == nil {
 
+	if err := сам.me.ИнитЛокал(); err == nil {
 
 		сам.t.Errorf("initLocalBad2(): err==nil\n")
 
 	}
 
 	fileEnv = _fileEnv
 
@@ -107,7 +107,7 @@ func (сам *tester) initLocalBad2() {
 
 func (сам *tester) initLocalBad1() {
 
 	_fileEnv := fileEnv
 
 	fileEnv = "4"
 
-	if err := сам.me.InitLocal(); err == nil {
 
+	if err := сам.me.ИнитЛокал(); err == nil {
 
 		сам.t.Errorf("initLocalBad1(): err==nil\n")
 
 	}
 
 	fileEnv = _fileEnv
 
@@ -238,12 +238,12 @@ func (сам *tester) readFileBad1() {
 
 
 // Иницилизация фейковыми данными
 
 func (сам *tester) initFake() {
 
-	сам.me.InitFake()
 
+	сам.me.ИнитФейк()
 
 }
 
 
 // Создание объекта переменных окружения
 
 func (сам *tester) create() {
 
-	сам.me = NewMockEnv()
 
+	сам.me = НовМокОкружение()
 
 	if сам.me == nil {
 
 		сам.t.Errorf("create(): mockEnv is nil\n")
 
 	}

+ 2 - 6
pkg/mock/mockapp/mockapp.go
Vizualizați fișierul 

@@ -12,7 +12,7 @@ type MockApp struct {
 
 	fnCancel func()
 
 	ctx      context.Context
 
 	bot      types.ИБот
 
-	store    types.ИХран
 
+	store    types.ИХранилище
 
 	block    *sync.RWMutex
 
 }
 
 
@@ -28,7 +28,7 @@ func NewMockApp() *MockApp {
 
 	return сам
 
 }
 
 
-func (сам *MockApp) Store() types.ИХран {
 
+func (сам *MockApp) Store() types.ИХранилище {
 
 	return сам.store
 
 }
 
 
@@ -67,7 +67,3 @@ func (сам *MockApp) NetClient() types.ИБотСеть {
 
 func (сам *MockApp) ServBots() types.ИБотоФерма {
 
 	return nil
 
 }
 
-
 
-func (сам *MockApp) Gui() types.ИГуи {
 
-	return nil
 
-}

+ 1 - 1
pkg/mock/mockkernel/mockkernel.go
Vizualizați fișierul 

@@ -36,7 +36,7 @@ func NewMockKernel() types.ИЯдро {
 
 }
 
 
 // Store -- возвращает хранилище данных
 
-func (сам *MockKernel) Store() types.ИХран {
 
+func (сам *MockKernel) Store() types.ИХранилище {
 
 	return nil
 
 }

+ 2 - 2
pkg/scene/scene.go
Vizualizați fișierul 

@@ -48,11 +48,11 @@ func (сам *Сцена) Отмена() {
 
 }
 
 
 // Кнт -- возвращает контекст сцены
 
-func (сам *Сцена) Кнт() context.Context {
 
+func (сам *Сцена) Контекст() context.Context {
 
 	return сам.кнт
 
 }
 
 
-// Имя - -возвращает имя сцены
 
+// Имя -- возвращает имя сцены
 
 func (сам *Сцена) Имя() alias.СценаИмя {
 
 	return сам.сценаИмя
 
 }

+ 1 - 1
pkg/section/down_time/down_time.go
Vizualizați fișierul 

@@ -43,7 +43,7 @@ func НовВремОбрат(сцена types.ИСцена, время alias.М
 
 	if сцена == nil {
 
 		panic("НовВремОбрат(): ИСцена == nil")
 
 	}
 
-	кнт, фнОтмена := context.WithCancel(сцена.Кнт())
 
+	кнт, фнОтмена := context.WithCancel(сцена.Контекст())
 
 	сам := &ВремОбрат{
 
 		сцена:        сцена,
 
 		текущ:        safe_int.НовБезопЦелое(),

+ 12 - 3
pkg/section/down_time/down_time_test.go
Vizualizați fișierul 

@@ -60,7 +60,10 @@ func (сам *tester) cancel() {
 
 func (сам *tester) checkTick() {
 
 	времОбрат := НовВремОбрат(сам.zone, 0)
 
 	{ // Секундный тик
 
-		времОбрат.Уст("00:00:08")
 
+		ош := времОбрат.Уст("00:00:08")
 
+		if ош != nil {
 
+			сам.t.Errorf("checkTick(): ош=%v", ош)
 
+		}
 
 		time.Sleep(time.Second * 1)
 
 		if val := времОбрат.String(); val != "00:00:08" {
 
 			сам.t.Errorf("checkTick(): счётчик(%v)!='00:00:08'", val)
 
@@ -74,14 +77,20 @@ func (сам *tester) checkTick() {
 
 	}
 
 	{ // Проверка обратного вызова прямо сейчас
 
 		strTime := alias.Время(time.Now().UTC().Format("15:04:05"))
 
-		времОбрат.Уст(strTime)
 
+		ош := времОбрат.Уст(strTime)
 
+		if ош != nil {
 
+			сам.t.Errorf("checkTick(): ош=%v", ош)
 
+		}
 
 		if val := времОбрат.String(); val != string(strTime) {
 
 			сам.t.Errorf("checkTick(): счётчик(%v)!=%s", val, strTime)
 
 		}
 
 		// Выход из функции -- и есть факт обратного вызова
 
 		сам.call()
 
 		{ // Проверка отсутствия обратного вызова прямо сейчас
 
-			времОбрат.Уст("00:00:00")
 
+			ош := времОбрат.Уст("00:00:00")
 
+			if ош != nil {
 
+				сам.t.Errorf("checkTick(): ош=%v", ош)
 
+			}
 
 			// Выход из функции -- и есть факт обратного вызова
 
 			сам.call()
 
 			if val := времОбрат.ПолучМилСек(); val != 0 {

+ 1 - 1
pkg/types/ibattle_action.go
Vizualizați fișierul 

@@ -18,7 +18,7 @@ type ИСражениеДействие interface {
 
 	// ВыстрелБлок -- признак запрета на стрельбу
 
 	ВыстрелБлок() ИЕслиВыстрел
 
 	// Кнт -- возвращает контекст битвы
 
-	Кнт() context.Context
 
+	Контекст() context.Context
 
 	// Отменить -- вызывает контекст отмены битвы
 
 	Отменить()
 
 }

+ 0 - 9
pkg/types/igui.go
Vizualizați fișierul 

@@ -1,9 +0,0 @@
 
-package types
 
-
 
-import "fyne.io/fyne/v2"
 
-
 
-// ИГуи -- интерфейс к графической подсистеме
 
-type ИГуи interface {
 
-	// ФайнПрилож -- возвращает объект Fyne-приложения
 
-	ФайнПрилож() fyne.App
 
-}

+ 1 - 1
pkg/types/ikernel.go
Vizualizați fișierul 

@@ -29,5 +29,5 @@ type ИЯдро interface {
 
 	// CtxApp -- возвращает контекст приложения
 
 	CtxApp() context.Context
 
 	// Store -- возвращает хранилище
 
-	Store() ИХран
 
+	Store() ИХранилище
 
 }

+ 10 - 10
pkg/types/ikernel_store.go
Vizualizați fișierul 

@@ -1,14 +1,14 @@
 
 // package types -- типы плагина
 
 package types
 
 
-// ИХран -- интерфейс хранилища
 
-type ИХран interface {
 
-	// Put -- добавляет в хранилище значение по ключу
 
-	Put(key string, value []byte) error
 
-	// Get -- возвращает значение по ключу
 
-	Get(key string) ([]byte, error)
 
-	// Del -- удаляет значение по ключу
 
-	Del(key string) error
 
-	// Find -- возвращает список ключей по префиксу
 
-	Find(prefix string) ([]string, error)
 
+// ИХранилище -- интерфейс хранилища
 
+type ИХранилище interface {
 
+	// Уст -- устанавливает в хранилище значение по ключу
 
+	Уст(ключ string, знач []byte) error
 
+	// Получ -- возвращает значение по ключу
 
+	Получ(ключ string) ([]byte, error)
 
+	// Удалить -- удаляет значение по ключу
 
+	Удалить(ключ string) error
 
+	// Найти -- возвращает список ключей по префиксу
 
+	Найти(префикс string) ([]string, error)
 
 }

+ 2 - 2
pkg/types/iscene.go
Vizualizați fișierul 

@@ -9,8 +9,8 @@ import (
 
 type ИСцена interface {
 
 	// Бот -- возвращает бота игровой сцены
 
 	Бот() ИБот
 
-	// Кнт -- контекст игровой зоны
 
-	Кнт() context.Context
 
+	// Контекст -- контекст игровой зоны
 
+	Контекст() context.Context
 
 	// Отмена -- отмена контекста игровой сцены
 
 	Отмена()
 
 	// Имя -- имя игровой сцены

+ 1 - 3
pkg/types/iserver.go
Vizualizați fișierul 

@@ -8,13 +8,11 @@ package types
 
 type ИСервер interface {
 
 	ИЯдро
 
 	// Store -- хранилище приложения
 
-	Store() ИХран
 
+	Store() ИХранилище
 
 	// Run -- запускает приложение в работу
 
 	Run() error
 
 	// ServBots -- словарь имеющихся ботов
 
 	ServBots() ИБотоФерма
 
-	// Gui -- возвращает объект графики
 
-	Gui() ИГуи
 
 	// Стат -- возвращает статистику сервера
 
 	Стат() ИСерверСтат
 
 }

+ 0 - 27
requiments.txt
Vizualizați fișierul 

@@ -1,27 +0,0 @@
 
-Package            Version
 
------------------- ---------
 
-astroid            2.15.7
 
-certifi            2023.7.22
 
-charset-normalizer 3.2.0
 
-dill               0.3.7
 
-flake8             6.1.0
 
-idna               3.4
 
-isort              5.12.0
 
-lazy-object-proxy  1.9.0
 
-mccabe             0.7.0
 
-mypy               1.5.1
 
-mypy-extensions    1.0.0
 
-pip                23.2.1
 
-platformdirs       3.10.0
 
-pycodestyle        2.11.0
 
-pydocstyle         6.3.0
 
-pyflakes           3.1.0
 
-pylama             8.4.1
 
-pylint             2.17.6
 
-requests           2.31.0
 
-setuptools         65.5.0
 
-snowballstemmer    2.2.0
 
-tomlkit            0.12.1
 
-typing_extensions  4.8.0
 
-urllib3            2.0.5
 
-wrapt              1.15.0

+ 0 - 0
internal/server/helper/helper.go → server/helper/helper.go
Vizualizați fișierul


+ 4 - 4
internal/server/serv_bots/dict_warbot/dict_warbot.go → server/serv_bots/dict_warbot/dict_warbot.go
Vizualizați fișierul 

@@ -8,9 +8,9 @@ import (
 
 	"strings"
 
 	"sync"
 
 
-	"wartank/internal/server/serv_bots/warbot"
 
 	"wartank/pkg/alias"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot"
 
 )
 
 
 const (
 
@@ -20,7 +20,7 @@ const (
 
 // DictWarBot -- потокобезопасный словарь ботов
 
 type DictWarBot struct {
 
 	server types.ИСервер
 
-	store  types.ИХран
 
+	store  types.ИХранилище
 
 	dict   map[alias.БотНомер]types.ИБот
 
 	block  sync.RWMutex
 
 }
 
@@ -79,7 +79,7 @@ func (сам *DictWarBot) save() {
 
 		strNumber += fmt.Sprint(botNumber) + ";"
 
 	}
 
 	strNumber = strNumber[:len(strNumber)-1]
 
-	err := сам.store.Put(strBotList, []byte(strNumber))
 
+	err := сам.store.Уст(strBotList, []byte(strNumber))
 
 	if err != nil {
 
 		сам.server.CancelApp()
 
 	}
 
@@ -87,7 +87,7 @@ func (сам *DictWarBot) save() {
 
 
 // Загружает всех ботов с базы
 
 func (сам *DictWarBot) load() error {
 
-	binNumber, err := сам.store.Get(strBotList)
 
+	binNumber, err := сам.store.Получ(strBotList)
 
 	if err != nil {
 
 		if !strings.Contains(err.Error(), "not found") {
 
 			return fmt.Errorf("DictWarBot.load(): in get list bot, err=\n\t%w", err)

+ 3 - 3
internal/server/serv_bots/serv_bots.go → server/serv_bots/serv_bots.go
Vizualizați fișierul 

@@ -4,16 +4,16 @@ package serv_bots
 
 import (
 
 	"fmt"
 
 
-	"wartank/internal/server/serv_bots/dict_warbot"
 
-	"wartank/internal/server/serv_bots/warbot"
 
 	"wartank/pkg/alias"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/dict_warbot"
 
+	"wartank/server/serv_bots/warbot"
 
 )
 
 
 // БотоФерма -- словарь ботов на сервере
 
 type БотоФерма struct {
 
 	серв    types.ИСервер
 
-	хран    types.ИХран
 
+	хран    types.ИХранилище
 
 	dictBot *dict_warbot.DictWarBot
 
 }

+ 11 - 11
internal/server/serv_bots/warbot/angar/angar.go → server/serv_bots/warbot/angar/angar.go
Vizualizați fișierul 

@@ -8,19 +8,19 @@ import (
 
 	"strconv"
 
 	"strings"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/angarnet"
 
-	"wartank/internal/server/serv_bots/warbot/angar/base"
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle"
 
-	"wartank/internal/server/serv_bots/warbot/angar/convoy"
 
-	"wartank/internal/server/serv_bots/warbot/angar/fuel"
 
-	"wartank/internal/server/serv_bots/warbot/angar/fuel_attack"
 
-	"wartank/internal/server/serv_bots/warbot/angar/masters"
 
-	"wartank/internal/server/serv_bots/warbot/angar/missions"
 
-	"wartank/internal/server/serv_bots/warbot/angar/netstat"
 
-	"wartank/internal/server/serv_bots/warbot/angar/tank_params"
 
-	"wartank/internal/server/serv_bots/warbot/tank/tankstat/static_param"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/angarnet"
 
+	"wartank/server/serv_bots/warbot/angar/base"
 
+	"wartank/server/serv_bots/warbot/angar/battle"
 
+	"wartank/server/serv_bots/warbot/angar/convoy"
 
+	"wartank/server/serv_bots/warbot/angar/fuel"
 
+	"wartank/server/serv_bots/warbot/angar/fuel_attack"
 
+	"wartank/server/serv_bots/warbot/angar/masters"
 
+	"wartank/server/serv_bots/warbot/angar/missions"
 
+	"wartank/server/serv_bots/warbot/angar/netstat"
 
+	"wartank/server/serv_bots/warbot/angar/tank_params"
 
+	"wartank/server/serv_bots/warbot/tank/tankstat/static_param"
 
 
 	"github.com/sirupsen/logrus"
 
 )

+ 0 - 0
internal/server/serv_bots/warbot/angar/angarnet/angarnet.go → server/serv_bots/warbot/angar/angarnet/angarnet.go
Vizualizați fișierul


+ 4 - 7
internal/server/serv_bots/warbot/angar/base/arsenal/arsenal.go → server/serv_bots/warbot/angar/base/arsenal/arsenal.go
Vizualizați fișierul 

@@ -1,3 +1,4 @@
 
+// package arsenal -- объект оружейной на базе
 
 package arsenal
 
 
 import (
 
@@ -8,16 +9,12 @@ import (
 
 	"strings"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/arsenal/arsenalnet"
 
-	"wartank/internal/server/serv_bots/warbot/tank/tankstat/static_param"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/base/arsenal/arsenalnet"
 
+	"wartank/server/serv_bots/warbot/tank/tankstat/static_param"
 
 )
 
 
-/*
 
-	Объект оружейной на базе
 
-*/
 
-
 
 const (
 
 	стрКумулятивы = "кумулятивы"
 
 	стрБронебойки = "бронебойки"
 
@@ -74,7 +71,7 @@ func НовОружейная(база types.ИБаза) (*Оружейная, e
 
 	if ош != nil {
 
 		return nil, fmt.Errorf("НовШахта(): при создании статистики числа добычи, ош=\n\t%w", ош)
 
 	}
 
-	кнт, фнОтмена := context.WithCancel(база.Кнт())
 
+	кнт, фнОтмена := context.WithCancel(база.Контекст())
 
 	сам := &Оружейная{
 
 		Секция:     section,
 
 		бот:        база.Бот(),

+ 0 - 0
internal/server/serv_bots/warbot/angar/base/arsenal/arsenalnet/arsenalnet.go → server/serv_bots/warbot/angar/base/arsenal/arsenalnet/arsenalnet.go
Vizualizați fișierul


+ 3 - 3
internal/server/serv_bots/warbot/angar/base/bank/bank.go → server/serv_bots/warbot/angar/base/bank/bank.go
Vizualizați fișierul 

@@ -7,12 +7,12 @@ import (
 
 	"strings"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/bank/bankmode"
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/bank/banknet"
 
-	"wartank/internal/server/serv_bots/warbot/tank/tankstat/static_param"
 
 	"wartank/pkg/alias"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/base/bank/bankmode"
 
+	"wartank/server/serv_bots/warbot/angar/base/bank/banknet"
 
+	"wartank/server/serv_bots/warbot/tank/tankstat/static_param"
 
 )
 
 
 /*

+ 1 - 1
internal/server/serv_bots/warbot/angar/base/bank/bankmode/bankmode.go → server/serv_bots/warbot/angar/base/bank/bankmode/bankmode.go
Vizualizați fișierul 

@@ -1,8 +1,8 @@
 
 package bankmode
 
 
 import (
 
-	"wartank/internal/server/serv_bots/warbot/tank/tankstat/static_param"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/tank/tankstat/static_param"
 
 )
 
 
 /*

+ 0 - 0
internal/server/serv_bots/warbot/angar/base/bank/banknet/banknet.go → server/serv_bots/warbot/angar/base/bank/banknet/banknet.go
Vizualizați fișierul


+ 9 - 9
internal/server/serv_bots/warbot/angar/base/base.go → server/serv_bots/warbot/angar/base/base.go
Vizualizați fișierul 

@@ -8,18 +8,18 @@ import (
 
 	"sync"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/arsenal"
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/bank"
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/basenet"
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/fuel"
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/labor"
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/market"
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/mine"
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/polygon"
 
 	"wartank/pkg/alias"
 
 	"wartank/pkg/cons"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/base/arsenal"
 
+	"wartank/server/serv_bots/warbot/angar/base/bank"
 
+	"wartank/server/serv_bots/warbot/angar/base/basenet"
 
+	"wartank/server/serv_bots/warbot/angar/base/fuel"
 
+	"wartank/server/serv_bots/warbot/angar/base/labor"
 
+	"wartank/server/serv_bots/warbot/angar/base/market"
 
+	"wartank/server/serv_bots/warbot/angar/base/mine"
 
+	"wartank/server/serv_bots/warbot/angar/base/polygon"
 
 )
 
 
 /*
 
@@ -136,7 +136,7 @@ func (сам *База) пуск() {
 
 	}
 
 	for {
 
 		select {
 
-		case <-сам.Кнт().Done():
 
+		case <-сам.Контекст().Done():
 
 			return
 
 		// case <-сам.ВремяОпрос().КаналСиг():
 
 		// 	фнЦикл()

+ 0 - 0
internal/server/serv_bots/warbot/angar/base/basenet/basenet.go → server/serv_bots/warbot/angar/base/basenet/basenet.go
Vizualizați fișierul


+ 3 - 3
internal/server/serv_bots/warbot/angar/base/fuel/fuel.go → server/serv_bots/warbot/angar/base/fuel/fuel.go
Vizualizați fișierul 

@@ -9,10 +9,10 @@ import (
 
 	"strings"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/fuel/fuel_net"
 
-	"wartank/internal/server/serv_bots/warbot/tank/tankstat/static_param"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/base/fuel/fuel_net"
 
+	"wartank/server/serv_bots/warbot/tank/tankstat/static_param"
 
 )
 
 
 // СкладТоплива -- склад топлива
 
@@ -42,7 +42,7 @@ func НовСкладТоплива(база types.ИБаза) (*СкладТо
 
 	if ош != nil {
 
 		return nil, fmt.Errorf("НовСкладТоплива(): при создании статистики уровня, ош=\n\t%w", ош)
 
 	}
 
-	кнт, фнОтмена := context.WithCancel(база.Кнт())
 
+	кнт, фнОтмена := context.WithCancel(база.Контекст())
 
 	сам := &СкладТоплива{
 
 		Секция:   секция,
 
 		бот:      база.Бот(),

+ 0 - 0
internal/server/serv_bots/warbot/angar/base/fuel/fuel_net/fuel_net.go → server/serv_bots/warbot/angar/base/fuel/fuel_net/fuel_net.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/base/labor/labor.go → server/serv_bots/warbot/angar/base/labor/labor.go
Vizualizați fișierul


+ 2 - 2
internal/server/serv_bots/warbot/angar/base/market/market.go → server/serv_bots/warbot/angar/base/market/market.go
Vizualizați fișierul 

@@ -7,11 +7,11 @@ import (
 
 	"strings"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/market/marketnet"
 
-	"wartank/internal/server/serv_bots/warbot/tank/tankstat/static_param"
 
 	"wartank/pkg/alias"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/base/market/marketnet"
 
+	"wartank/server/serv_bots/warbot/tank/tankstat/static_param"
 
 )
 
 
 /*

+ 0 - 0
internal/server/serv_bots/warbot/angar/base/market/marketnet/marketnet.go → server/serv_bots/warbot/angar/base/market/marketnet/marketnet.go
Vizualizați fișierul


+ 3 - 3
internal/server/serv_bots/warbot/angar/base/mine/mine.go → server/serv_bots/warbot/angar/base/mine/mine.go
Vizualizați fișierul 

@@ -8,11 +8,11 @@ import (
 
 	"strings"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/mine/minenet"
 
-	"wartank/internal/server/serv_bots/warbot/tank/tankstat/static_param"
 
 	"wartank/pkg/alias"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/base/mine/minenet"
 
+	"wartank/server/serv_bots/warbot/tank/tankstat/static_param"
 
 )
 
 
 /*
 
@@ -67,7 +67,7 @@ func НовШахта(база types.ИБаза) (*Шахта, error) {
 
 	if ош != nil {
 
 		return nil, fmt.Errorf("НовШахта(): при создании статистики числа добычи, ош=\n\t%w", ош)
 
 	}
 
-	кнт, фнОтмена := context.WithCancel(база.Кнт())
 
+	кнт, фнОтмена := context.WithCancel(база.Контекст())
 
 	сам := &Шахта{
 
 		Секция:     секция,
 
 		бот:        база.Бот(),

+ 0 - 0
internal/server/serv_bots/warbot/angar/base/mine/minenet/minenet.go → server/serv_bots/warbot/angar/base/mine/minenet/minenet.go
Vizualizați fișierul


+ 3 - 3
internal/server/serv_bots/warbot/angar/base/polygon/polygon.go → server/serv_bots/warbot/angar/base/polygon/polygon.go
Vizualizați fișierul 

@@ -7,14 +7,14 @@ import (
 
 	"strings"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/base/polygon/polygonnet"
 
-	"wartank/internal/server/serv_bots/warbot/tank/tankstat/static_param"
 
 	"wartank/pkg/alias"
 
 	"wartank/pkg/components/safe_int"
 
 	"wartank/pkg/components/safe_string"
 
 	"wartank/pkg/cons"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/base/polygon/polygonnet"
 
+	"wartank/server/serv_bots/warbot/tank/tankstat/static_param"
 
 )
 
 
 /*
 
@@ -125,7 +125,7 @@ func (сам *Полигон) пуск() {
 
 	}
 
 	for {
 
 		select {
 
-		case <-сам.Кнт().Done():
 
+		case <-сам.Контекст().Done():
 
 			return
 
 		case <-сам.ВремяОстат().КаналСиг():
 
 			фнРабота()

+ 0 - 0
internal/server/serv_bots/warbot/angar/base/polygon/polygonnet/polygonnet.go → server/serv_bots/warbot/angar/base/polygon/polygonnet/polygonnet.go
Vizualizați fișierul


+ 3 - 3
internal/server/serv_bots/warbot/angar/battle/battle.go → server/serv_bots/warbot/angar/battle/battle.go
Vizualizați fișierul 

@@ -6,11 +6,11 @@ import (
 
 	"net/http"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_register"
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_wait"
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_register"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_wait"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker"
 
 )
 
 
 // Сражение -- объект сражения

+ 0 - 0
internal/server/serv_bots/warbot/angar/battle/battle_register/battle_register.go → server/serv_bots/warbot/angar/battle/battle_register/battle_register.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/battle/battle_wait/battle_wait.go → server/serv_bots/warbot/angar/battle/battle_wait/battle_wait.go
Vizualizați fișierul


+ 4 - 4
internal/server/serv_bots/warbot/angar/battle/battle_worker/battle_worker.go → server/serv_bots/warbot/angar/battle/battle_worker/battle_worker.go
Vizualizați fișierul 

@@ -5,12 +5,12 @@ import (
 
 	"fmt"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon"
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/battlesound"
 
-	"wartank/internal/server/serv_bots/warbot/tank/tankstat/static_param"
 
 	"wartank/pkg/components/scene_net"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker/battleon"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker/battleon/battlesound"
 
+	"wartank/server/serv_bots/warbot/tank/tankstat/static_param"
 
 )
 
 
 // СражениеДействие -- исполнение битвы
 
@@ -59,7 +59,7 @@ func (сам *СхваткаИсполнитель) Танковать() {
 
 	}
 
 	сам.sound.Play()
 
 	time.Sleep(time.Second * 10) // Задержка для звука на странице
 
-	<-сам.действие.Кнт().Done()
 
+	<-сам.действие.Контекст().Done()
 
 	// log._rintf("Battle.runBaton(): сражение завершено\n")
 
 }

+ 5 - 5
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/battleon.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/battleon.go
Vizualizați fișierul 

@@ -5,13 +5,13 @@ import (
 
 	"fmt"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/health"
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/manevr"
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot"
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot/isshot"
 
 	"wartank/pkg/components/scene_net"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker/battleon/health"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker/battleon/manevr"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot/isshot"
 
 )
 
 
 /*
 
@@ -105,7 +105,7 @@ func (сам *СражениеДействие) ВыстрелБлок() types.
 
 }
 
 
 // Кнт -- возвращает контекст отмены сражения
 
-func (сам *СражениеДействие) Кнт() context.Context {
 
+func (сам *СражениеДействие) Контекст() context.Context {
 
 	return сам.кнт
 
 }

+ 1 - 1
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/battlesound/battlesound.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/battlesound/battlesound.go
Vizualizați fișierul 

@@ -3,8 +3,8 @@ package battlesound
 
 import (
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/battlesound/isplay"
 
 	"wartank/pkg/components/sound"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker/battleon/battlesound/isplay"
 
 )
 
 
 /*

+ 0 - 0
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/battlesound/isplay/isplay.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/battlesound/isplay/isplay.go
Vizualizați fișierul


+ 1 - 1
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/health/health.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/health.go
Vizualizați fișierul 

@@ -44,7 +44,7 @@ func (сам *Здоровье) makeTik() {
 
 	}()
 
 	for {
 
 		select {
 
-		case <-сам.Кнт().Done():
 
+		case <-сам.Контекст().Done():
 
 			return
 
 		default:
 
 			сам.канТик <- 1

+ 0 - 0
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/healthtime/healthtime.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/healthtime/healthtime.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/isrepair/isrepair.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/isrepair/isrepair.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/repairtime/repairtime.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/repairtime/repairtime.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/manevr/ismanevr/ismanevr.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/manevr/ismanevr/ismanevr.go
Vizualizați fișierul


+ 3 - 3
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/manevr/manevr.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/manevr/manevr.go
Vizualizați fișierul 

@@ -8,8 +8,8 @@ import (
 
 
 	"github.com/sirupsen/logrus"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/repairtime"
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/manevr/ismanevr"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/repairtime"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker/battleon/manevr/ismanevr"
 
 
 	// "wartank/internal/components/sound"
 
 	"wartank/pkg/types"
 
@@ -54,7 +54,7 @@ func (сам *Манёвр) makeTick() {
 
 	}()
 
 	for {
 
 		select {
 
-		case <-сам.Кнт().Done():
 
+		case <-сам.Контекст().Done():
 
 			return
 
 		default:
 
 			if сам.времяЖдать.Получ() <= 0 {

+ 0 - 0
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot/damage/damage.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot/damage/damage.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot/isshot/isshot.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot/isshot/isshot.go
Vizualizați fișierul


+ 1 - 1
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot/shot.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot/shot.go
Vizualizați fișierul 

@@ -50,7 +50,7 @@ func (сам *Выстрел) делайТик() {
 
 	}()
 
 	for {
 
 		select {
 
-		case <-сам.Кнт().Done():
 
+		case <-сам.Контекст().Done():
 
 			return
 
 		default:
 
 			сам.канТик <- 1 // Первый выстрел, потом спать по таймингу

+ 0 - 0
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/shottime/shottime.go → server/serv_bots/warbot/angar/battle/battle_worker/battleon/shottime/shottime.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/battle/battlenet/battlenet.go → server/serv_bots/warbot/angar/battle/battlenet/battlenet.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/battle/isrun/isrun.go → server/serv_bots/warbot/angar/battle/isrun/isrun.go
Vizualizați fișierul


+ 2 - 2
internal/server/serv_bots/warbot/angar/convoy/convoy.go → server/serv_bots/warbot/angar/convoy/convoy.go
Vizualizați fișierul 

@@ -9,11 +9,11 @@ import (
 
 
 	"github.com/sirupsen/logrus"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/convoy/convoynet"
 
-	"wartank/internal/server/serv_bots/warbot/tank/tankstat/static_param"
 
 	"wartank/pkg/alias"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/convoy/convoynet"
 
+	"wartank/server/serv_bots/warbot/tank/tankstat/static_param"
 
 )
 
 
 /*

+ 0 - 0
internal/server/serv_bots/warbot/angar/convoy/convoynet/convoynet.go → server/serv_bots/warbot/angar/convoy/convoynet/convoynet.go
Vizualizați fișierul


+ 3 - 3
internal/server/serv_bots/warbot/angar/death_match/battle.go → server/serv_bots/warbot/angar/death_match/battle.go
Vizualizați fișierul 

@@ -6,11 +6,11 @@ import (
 
 	"net/http"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_register"
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_wait"
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_register"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_wait"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker"
 
 )
 
 
 // Сражение -- объект схватки

+ 0 - 0
internal/server/serv_bots/warbot/angar/death_match/battle_wait/battle_wait.go → server/serv_bots/warbot/angar/death_match/battle_wait/battle_wait.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/death_match/death_net/death_net.go → server/serv_bots/warbot/angar/death_match/death_net/death_net.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/death_match/death_register/death_register.go → server/serv_bots/warbot/angar/death_match/death_register/death_register.go
Vizualizați fișierul


+ 1 - 1
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/battlesound/battlesound.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/battlesound/battlesound.go
Vizualizați fișierul 

@@ -3,8 +3,8 @@ package battlesound
 
 import (
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/battlesound/isplay"
 
 	"wartank/pkg/components/sound"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker/battleon/battlesound/isplay"
 
 )
 
 
 /*

+ 0 - 0
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/battlesound/isplay/isplay.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/battlesound/isplay/isplay.go
Vizualizați fișierul


+ 5 - 5
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/death_on.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/death_on.go
Vizualizați fișierul 

@@ -5,13 +5,13 @@ import (
 
 	"fmt"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/health"
 
-	"wartank/internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/manevr"
 
-	"wartank/internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot"
 
-	"wartank/internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot/isshot"
 
 	"wartank/pkg/components/scene_net"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/death_match/death_worker/death_on/health"
 
+	"wartank/server/serv_bots/warbot/angar/death_match/death_worker/death_on/manevr"
 
+	"wartank/server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot"
 
+	"wartank/server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot/isshot"
 
 )
 
 
 /*
 
@@ -104,7 +104,7 @@ func (сам *СхваткаДействие) ВыстрелБлок() types.И
 
 }
 
 
 // Кнт -- возвращает контекст отмены сражения
 
-func (сам *СхваткаДействие) Кнт() context.Context {
 
+func (сам *СхваткаДействие) Контекст() context.Context {
 
 	return сам.кнт
 
 }

+ 1 - 1
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/health.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/health/health.go
Vizualizați fișierul 

@@ -44,7 +44,7 @@ func (сам *Здоровье) makeTik() {
 
 	}()
 
 	for {
 
 		select {
 
-		case <-сам.Кнт().Done():
 
+		case <-сам.Контекст().Done():
 
 			return
 
 		default:
 
 			сам.канТик <- 1

+ 0 - 0
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/health/healthtime/healthtime.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/health/healthtime/healthtime.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/health/isrepair/isrepair.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/health/isrepair/isrepair.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/health/repairtime/repairtime.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/health/repairtime/repairtime.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/manevr/ismanevr/ismanevr.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/manevr/ismanevr/ismanevr.go
Vizualizați fișierul


+ 3 - 3
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/manevr/manevr.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/manevr/manevr.go
Vizualizați fișierul 

@@ -8,8 +8,8 @@ import (
 
 
 	"github.com/sirupsen/logrus"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/repairtime"
 
-	"wartank/internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/manevr/ismanevr"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker/battleon/health/repairtime"
 
+	"wartank/server/serv_bots/warbot/angar/battle/battle_worker/battleon/manevr/ismanevr"
 
 
 	// "wartank/internal/components/sound"
 
 	"wartank/pkg/types"
 
@@ -54,7 +54,7 @@ func (сам *Манёвр) makeTick() {
 
 	}()
 
 	for {
 
 		select {
 
-		case <-сам.Кнт().Done():
 
+		case <-сам.Контекст().Done():
 
 			return
 
 		default:
 
 			if сам.времяЖдать.Получ() <= 0 {

+ 0 - 0
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot/damage/damage.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot/damage/damage.go
Vizualizați fișierul


+ 0 - 0
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot/isshot/isshot.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot/isshot/isshot.go
Vizualizați fișierul


+ 1 - 1
internal/server/serv_bots/warbot/angar/battle/battle_worker/battleon/shot/shot.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/shot/shot.go
Vizualizați fișierul 

@@ -50,7 +50,7 @@ func (сам *Выстрел) делайТик() {
 
 	}()
 
 	for {
 
 		select {
 
-		case <-сам.Кнт().Done():
 
+		case <-сам.Контекст().Done():
 
 			return
 
 		default:
 
 			сам.канТик <- 1 // Первый выстрел, потом спать по таймингу

+ 0 - 0
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/shottime/shottime.go → server/serv_bots/warbot/angar/death_match/death_worker/death_on/shottime/shottime.go
Vizualizați fișierul


+ 4 - 4
internal/server/serv_bots/warbot/angar/death_match/death_worker/death_worker.go → server/serv_bots/warbot/angar/death_match/death_worker/death_worker.go
Vizualizați fișierul 

@@ -5,12 +5,12 @@ import (
 
 	"fmt"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on"
 
-	"wartank/internal/server/serv_bots/warbot/angar/death_match/death_worker/death_on/battlesound"
 
-	"wartank/internal/server/serv_bots/warbot/tank/tankstat/static_param"
 
 	"wartank/pkg/components/scene_net"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/death_match/death_worker/death_on"
 
+	"wartank/server/serv_bots/warbot/angar/death_match/death_worker/death_on/battlesound"
 
+	"wartank/server/serv_bots/warbot/tank/tankstat/static_param"
 
 )
 
 
 // СражениеДействие -- исполнение схватки
 
@@ -59,7 +59,7 @@ func (сам *СхваткаИсполнитель) Танковать() {
 
 	}
 
 	сам.sound.Play()
 
 	time.Sleep(time.Second * 10) // Задержка для звука на странице
 
-	<-сам.действие.Кнт().Done()
 
+	<-сам.действие.Контекст().Done()
 
 	// log._rintf("Battle.runBaton(): сражение завершено\n")
 
 }

+ 0 - 0
internal/server/serv_bots/warbot/angar/death_match/isrun/isrun.go → server/serv_bots/warbot/angar/death_match/isrun/isrun.go
Vizualizați fișierul


+ 1 - 1
internal/server/serv_bots/warbot/angar/division/division.go → server/serv_bots/warbot/angar/division/division.go
Vizualizați fișierul 

@@ -1,7 +1,7 @@
 
 package division
 
 
 import (
 
-	"wartank/internal/server/serv_bots/warbot/angar/division/divwar"
 
+	"wartank/server/serv_bots/warbot/angar/division/divwar"
 
 )
 
 
 /*

+ 4 - 4
internal/server/serv_bots/warbot/angar/division/divwar/divwar.go → server/serv_bots/warbot/angar/division/divwar/divwar.go
Vizualizați fișierul 

@@ -8,13 +8,13 @@ import (
 
 	"sync"
 
 	"time"
 
 
-	"wartank/internal/server/serv_bots/warbot/angar/division/divwar/divwarnet"
 
-	"wartank/internal/server/serv_bots/warbot/angar/division/divwar/divwaron"
 
-	"wartank/internal/server/serv_bots/warbot/angar/division/divwar/divwaron/divwarsound"
 
-	"wartank/internal/server/serv_bots/warbot/tank/tankstat/static_param"
 
 	"wartank/pkg/alias"
 
 	"wartank/pkg/section"
 
 	"wartank/pkg/types"
 
+	"wartank/server/serv_bots/warbot/angar/division/divwar/divwarnet"
 
+	"wartank/server/serv_bots/warbot/angar/division/divwar/divwaron"
 
+	"wartank/server/serv_bots/warbot/angar/division/divwar/divwaron/divwarsound"
 
+	"wartank/server/serv_bots/warbot/tank/tankstat/static_param"
 
 )
 
 
 /*

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff