From 395715010993b8274c8216605e8714199d031465 Mon Sep 17 00:00:00 2001 From: nick Date: Thu, 22 Aug 2024 01:08:44 +0900 Subject: [PATCH] fix: refactor internal variables and strings --- node/cmd/fetcher/main.go | 2 +- node/cmd/node/main.go | 2 +- node/pkg/admin/admin.go | 4 ++-- node/pkg/admin/tests/config_test.go | 2 +- node/pkg/api/utils/utils.go | 2 +- node/pkg/boot/boot.go | 2 +- node/pkg/boot/utils/utils.go | 2 +- node/pkg/checker/balance/app.go | 34 ++++++++++++++-------------- node/pkg/checker/balance/app_test.go | 4 ++-- node/pkg/checker/balance/types.go | 14 ++++++------ node/pkg/checker/event/app.go | 2 +- node/pkg/checker/event/types.go | 2 +- node/pkg/checker/peers/app.go | 8 +++---- node/pkg/dal/apiv2/controller.go | 2 +- node/pkg/por/app.go | 2 +- 15 files changed, 42 insertions(+), 42 deletions(-) diff --git a/node/cmd/fetcher/main.go b/node/cmd/fetcher/main.go index ce95b343b..570b02917 100644 --- a/node/cmd/fetcher/main.go +++ b/node/cmd/fetcher/main.go @@ -28,7 +28,7 @@ func main() { }() log.Info().Msg("Syncing orakl config") - err := admin.SyncOraklConfig(ctx) + err := admin.SyncMikoConfig(ctx) if err != nil { log.Error().Err(err).Msg("Failed to sync orakl config") return diff --git a/node/cmd/node/main.go b/node/cmd/node/main.go index 5cc410183..b760c40f2 100644 --- a/node/cmd/node/main.go +++ b/node/cmd/node/main.go @@ -58,7 +58,7 @@ func main() { }() log.Info().Msg("Syncing orakl config") - err = admin.SyncOraklConfig(ctx) + err = admin.SyncMikoConfig(ctx) if err != nil { log.Error().Err(err).Msg("Failed to sync orakl config") return diff --git a/node/pkg/admin/admin.go b/node/pkg/admin/admin.go index 5702a43a6..53f262e53 100644 --- a/node/pkg/admin/admin.go +++ b/node/pkg/admin/admin.go @@ -32,7 +32,7 @@ func Run(ctx context.Context, bus *bus.MessageBus) error { v1 := app.Group("/api/v1") v1.Get("/", func(c *fiber.Ctx) error { - return c.SendString("Orakl Node Admin API") + return c.SendString("Miko Node Admin API") }) feed.Routes(v1) @@ -57,6 +57,6 @@ func Run(ctx context.Context, bus *bus.MessageBus) error { return nil } -func SyncOraklConfig(ctx context.Context) error { +func SyncMikoConfig(ctx context.Context) error { return config.InitSyncDb(ctx) } diff --git a/node/pkg/admin/tests/config_test.go b/node/pkg/admin/tests/config_test.go index e77d9512e..7a1e860da 100644 --- a/node/pkg/admin/tests/config_test.go +++ b/node/pkg/admin/tests/config_test.go @@ -35,7 +35,7 @@ func TestConfigSync(t *testing.T) { } assert.Greater(t, len(readResult), 1) - // should remove previously inserted config and feed which doesn't exist in orakl-config + // should remove previously inserted config and feed which doesn't exist in miko-config readTmpConfigResult, err := GetRequest[config.ConfigModel](testItems.app, "/api/v1/config/"+strconv.Itoa(int(testItems.tmpData.config.ID)), nil) if err != nil { t.Fatalf("error getting config: %v", err) diff --git a/node/pkg/api/utils/utils.go b/node/pkg/api/utils/utils.go index dc3a24cd1..8bbc31117 100644 --- a/node/pkg/api/utils/utils.go +++ b/node/pkg/api/utils/utils.go @@ -128,7 +128,7 @@ func Setup(options ...string) (AppConfig, error) { } app := fiber.New(fiber.Config{ - AppName: "Orakl API " + version, + AppName: "Miko API " + version, EnablePrintRoutes: true, ErrorHandler: CustomErrorHandler, }) diff --git a/node/pkg/boot/boot.go b/node/pkg/boot/boot.go index 46b930379..ba51fc614 100644 --- a/node/pkg/boot/boot.go +++ b/node/pkg/boot/boot.go @@ -37,7 +37,7 @@ func Run(ctx context.Context) error { v1 := app.Group("/api/v1") v1.Get("/", func(c *fiber.Ctx) error { - return c.SendString("Orakl Node Boot API") + return c.SendString("Miko Node Boot API") }) peer.Routes(v1) diff --git a/node/pkg/boot/utils/utils.go b/node/pkg/boot/utils/utils.go index 16fefc4bb..b40e6de71 100644 --- a/node/pkg/boot/utils/utils.go +++ b/node/pkg/boot/utils/utils.go @@ -25,7 +25,7 @@ func Setup(ctx context.Context, h *host.Host) (*fiber.App, error) { } app := fiber.New(fiber.Config{ - AppName: "Orakl BootNode API 0.0.1", + AppName: "Miko BootNode API 0.0.1", EnablePrintRoutes: true, ErrorHandler: CustomErrorHandler, }) diff --git a/node/pkg/checker/balance/app.go b/node/pkg/checker/balance/app.go index d9596278e..ad8751998 100644 --- a/node/pkg/checker/balance/app.go +++ b/node/pkg/checker/balance/app.go @@ -116,18 +116,18 @@ func loadEnvs() { } func getUrls() (Urls, error) { - oraklApiUrl := os.Getenv("ORAKL_API_URL") - if oraklApiUrl == "" { + mikoApiUrl := os.Getenv("ORAKL_API_URL") + if mikoApiUrl == "" { return Urls{}, errors.New("ORAKL_API_URL not found") } - oraklNodeAdminUrl := os.Getenv("ORAKL_NODE_ADMIN_URL") - if oraklNodeAdminUrl == "" { + mikoNodeAdminUrl := os.Getenv("ORAKL_NODE_ADMIN_URL") + if mikoNodeAdminUrl == "" { return Urls{}, errors.New("ORAKL_NODE_ADMIN_URL not found") } - oraklDelegatorUrl := os.Getenv("ORAKL_DELEGATOR_URL") - if oraklDelegatorUrl == "" { + mikoDelegatorUrl := os.Getenv("ORAKL_DELEGATOR_URL") + if mikoDelegatorUrl == "" { return Urls{}, errors.New("ORAKL_DELEGATOR_URL not found") } @@ -142,18 +142,18 @@ func getUrls() (Urls, error) { } return Urls{ - JsonRpcUrl: jsonRpcUrl, - OraklApiUrl: oraklApiUrl, - OraklNodeAdminUrl: oraklNodeAdminUrl, - OraklDelegatorUrl: oraklDelegatorUrl, - PorUrl: porUrl, + JsonRpcUrl: jsonRpcUrl, + MikoApiUrl: mikoApiUrl, + MikoNodeAdminUrl: mikoNodeAdminUrl, + MikoDelegatorUrl: mikoDelegatorUrl, + PorUrl: porUrl, }, nil } func loadWallets(ctx context.Context, urls Urls) ([]Wallet, error) { result := []Wallet{} - apiWallets, err := loadWalletFromOraklApi(ctx, urls.OraklApiUrl) + apiWallets, err := loadWalletFromMikoApi(ctx, urls.MikoApiUrl) if err != nil { return result, err } @@ -165,7 +165,7 @@ func loadWallets(ctx context.Context, urls Urls) ([]Wallet, error) { } result = append(result, porWallet) - delegatorWallet, err := loadWalletFromDelegator(ctx, urls.OraklDelegatorUrl) + delegatorWallet, err := loadWalletFromDelegator(ctx, urls.MikoDelegatorUrl) if err != nil { return result, err } @@ -174,14 +174,14 @@ func loadWallets(ctx context.Context, urls Urls) ([]Wallet, error) { return result, nil } -func loadWalletFromOraklApi(ctx context.Context, url string) ([]Wallet, error) { +func loadWalletFromMikoApi(ctx context.Context, url string) ([]Wallet, error) { type ReporterModel struct { Address string `json:"address"` Service string `json:"service"` } result := []Wallet{} - reporters, err := request.Request[[]ReporterModel](request.WithEndpoint(url+oraklApiEndpoint), request.WithTimeout(30*time.Second)) + reporters, err := request.Request[[]ReporterModel](request.WithEndpoint(url+mikoApiEndpoint), request.WithTimeout(30*time.Second)) if err != nil { return result, err } @@ -201,7 +201,7 @@ func loadWalletFromOraklApi(ctx context.Context, url string) ([]Wallet, error) { Address: address, Balance: 0, Minimum: minimumBalance, - Tag: "reporter loaded from orakl api", + Tag: "reporter loaded from miko api", BalanceHistory: []BalanceHistoryEntry{}, } @@ -245,7 +245,7 @@ func loadWalletFromPor(ctx context.Context, url string) (Wallet, error) { func loadWalletFromDelegator(ctx context.Context, url string) (Wallet, error) { wallet := Wallet{} - feePayer, err := request.Request[string](request.WithEndpoint(url + oraklDelegatorEndpoint)) + feePayer, err := request.Request[string](request.WithEndpoint(url + mikoDelegatorEndpoint)) if err != nil { return wallet, err } diff --git a/node/pkg/checker/balance/app_test.go b/node/pkg/checker/balance/app_test.go index 8f42c6293..61fd951f9 100644 --- a/node/pkg/checker/balance/app_test.go +++ b/node/pkg/checker/balance/app_test.go @@ -19,14 +19,14 @@ const ( testAddressWithFixedKlay = "0x2138824ef8741add09E8680F968e1d5D0AC155E0" ) -func TestLoadWalletFromOraklApi(t *testing.T) { +func TestLoadWalletFromMikoApi(t *testing.T) { ctx := context.Background() mockServer := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { rw.Write([]byte(`[{"pk":"abc", "address":"` + testAddr0 + `", "service":"REQUEST_RESPONSE"},{"pk":"def", "address":"` + testAddr1 + `", "service":"VRF"}]`)) })) defer mockServer.Close() - wallets, err := loadWalletFromOraklApi(ctx, mockServer.URL) + wallets, err := loadWalletFromMikoApi(ctx, mockServer.URL) if err != nil { t.Fatalf("Expected no error, got %v", err) } diff --git a/node/pkg/checker/balance/types.go b/node/pkg/checker/balance/types.go index 5013a7cb3..51562258d 100644 --- a/node/pkg/checker/balance/types.go +++ b/node/pkg/checker/balance/types.go @@ -8,8 +8,8 @@ import ( ) const ( - oraklApiEndpoint = "/reporter" - oraklDelegatorEndpoint = "/sign/feePayer" + mikoApiEndpoint = "/reporter" + mikoDelegatorEndpoint = "/sign/feePayer" porEndpoint = "/address" DefaultRRMinimum = 1 BalanceHistoryTTL = 60 * time.Minute @@ -26,11 +26,11 @@ var klaytnClient *client.Client var wallets []Wallet type Urls struct { - JsonRpcUrl string - OraklApiUrl string - OraklNodeAdminUrl string - OraklDelegatorUrl string - PorUrl string + JsonRpcUrl string + MikoApiUrl string + MikoNodeAdminUrl string + MikoDelegatorUrl string + PorUrl string } type Wallet struct { diff --git a/node/pkg/checker/event/app.go b/node/pkg/checker/event/app.go index 3c6073fe9..c5ae01195 100644 --- a/node/pkg/checker/event/app.go +++ b/node/pkg/checker/event/app.go @@ -271,7 +271,7 @@ func timeSinceLastPorEvent(ctx context.Context, feed FeedToCheck) (time.Duration func loadExpectedEventIntervals() ([]Config, error) { chain := os.Getenv("CHAIN") - url := loadOraklConfigUrl(chain) + url := loadMikoConfigUrl(chain) return request.Request[[]Config](request.WithEndpoint(url)) } diff --git a/node/pkg/checker/event/types.go b/node/pkg/checker/event/types.go index f18acf522..1c14f4b56 100644 --- a/node/pkg/checker/event/types.go +++ b/node/pkg/checker/event/types.go @@ -82,7 +82,7 @@ func loadUnfullfilledVRFEventQuery(schemaName string, eventName string) string { return fmt.Sprintf(`SELECT block$, id, time FROM %s.%s WHERE success = false ORDER BY time DESC;`, schemaName, eventName) } -func loadOraklConfigUrl(chain string) string { +func loadMikoConfigUrl(chain string) string { return fmt.Sprintf("https://config.orakl.network/%s_configs.json", chain) } diff --git a/node/pkg/checker/peers/app.go b/node/pkg/checker/peers/app.go index efc0bf4ad..32c045355 100644 --- a/node/pkg/checker/peers/app.go +++ b/node/pkg/checker/peers/app.go @@ -59,7 +59,7 @@ func Start() error { log.Error().Err(err).Msg("Failed to check peer count") failCount++ if failCount > 10 { - alert.SlackAlert(fmt.Sprintf("failed to check peer count %d times. Check orakl Sentinel logs", failCount)) + alert.SlackAlert(fmt.Sprintf("failed to check peer count %d times. Check miko Sentinel logs", failCount)) failCount = 0 } continue @@ -75,12 +75,12 @@ func Start() error { } func checkPeerCounts() (int, error) { - oraklNodeAdminUrl := os.Getenv("ORAKL_NODE_ADMIN_URL") - if oraklNodeAdminUrl == "" { + mikoNodeAdminUrl := os.Getenv("ORAKL_NODE_ADMIN_URL") + if mikoNodeAdminUrl == "" { return 0, errors.New("ORAKL_NODE_ADMIN_URL not found") } - resp, err := request.Request[peerCountResponse](request.WithEndpoint(oraklNodeAdminUrl+peerCountEndpoint), request.WithTimeout(10*time.Second)) + resp, err := request.Request[peerCountResponse](request.WithEndpoint(mikoNodeAdminUrl+peerCountEndpoint), request.WithTimeout(10*time.Second)) if err != nil { return 0, err } diff --git a/node/pkg/dal/apiv2/controller.go b/node/pkg/dal/apiv2/controller.go index b011ccf2f..077ed2bac 100644 --- a/node/pkg/dal/apiv2/controller.go +++ b/node/pkg/dal/apiv2/controller.go @@ -165,7 +165,7 @@ func (s *ServerV2) WSHandler(w http.ResponseWriter, r *http.Request) { func (s *ServerV2) HealthCheckHandler(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) - _, err := w.Write([]byte("Orakl Node DAL API")) + _, err := w.Write([]byte("Miko Node DAL API")) if err != nil { log.Error().Err(err).Msg("failed to write response") } diff --git a/node/pkg/por/app.go b/node/pkg/por/app.go index a7dc32dff..00f29c6a3 100644 --- a/node/pkg/por/app.go +++ b/node/pkg/por/app.go @@ -98,7 +98,7 @@ func (a *App) Run(ctx context.Context) error { http.HandleFunc("/api/v1", func(w http.ResponseWriter, r *http.Request) { // Respond with a simple string - _, err := w.Write([]byte("Orakl POR")) + _, err := w.Write([]byte("Miko POR")) if err != nil { log.Error().Err(err).Msg("failed to write response") }