From ad9236fd6b51f8351d285cee1f1a3247cd283e85 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Wed, 26 Jul 2023 16:53:50 -0400 Subject: [PATCH] refactor: move RPC and REST servers to waku cmd --- cmd/waku/node.go | 4 ++-- {waku/v2 => cmd/waku}/rest/debug.go | 0 {waku/v2 => cmd/waku}/rest/debug_api.yaml | 0 {waku/v2 => cmd/waku}/rest/debug_test.go | 0 {waku/v2 => cmd/waku}/rest/relay.go | 0 {waku/v2 => cmd/waku}/rest/relay_api.yaml | 0 {waku/v2 => cmd/waku}/rest/relay_test.go | 0 {waku/v2 => cmd/waku}/rest/runner.go | 0 {waku/v2 => cmd/waku}/rest/store.go | 0 {waku/v2 => cmd/waku}/rest/store_api.yaml | 0 {waku/v2 => cmd/waku}/rest/store_test.go | 0 {waku/v2 => cmd/waku}/rest/utils.go | 0 {waku/v2 => cmd/waku}/rest/utils_test.go | 0 {waku/v2 => cmd/waku}/rest/waku_rest.go | 0 {waku/v2 => cmd/waku}/rest/waku_rest_test.go | 0 {waku/v2 => cmd/waku}/rpc/admin.go | 0 {waku/v2 => cmd/waku}/rpc/admin_test.go | 0 {waku/v2 => cmd/waku}/rpc/codec.go | 0 {waku/v2 => cmd/waku}/rpc/coded_test.go | 0 {waku/v2 => cmd/waku}/rpc/debug.go | 0 {waku/v2 => cmd/waku}/rpc/debug_test.go | 0 {waku/v2 => cmd/waku}/rpc/filter.go | 0 {waku/v2 => cmd/waku}/rpc/filter_test.go | 0 {waku/v2 => cmd/waku}/rpc/private.go | 0 {waku/v2 => cmd/waku}/rpc/private_test.go | 0 {waku/v2 => cmd/waku}/rpc/relay.go | 0 {waku/v2 => cmd/waku}/rpc/relay_test.go | 0 {waku/v2 => cmd/waku}/rpc/rpc_type.go | 0 {waku/v2 => cmd/waku}/rpc/runner.go | 0 {waku/v2 => cmd/waku}/rpc/store.go | 0 {waku/v2 => cmd/waku}/rpc/store_test.go | 0 {waku/v2 => cmd/waku}/rpc/util_test.go | 0 {waku/v2 => cmd/waku}/rpc/utils.go | 0 {waku/v2 => cmd/waku}/rpc/waku_rpc.go | 0 {waku/v2 => cmd/waku}/rpc/waku_rpc_test.go | 0 35 files changed, 2 insertions(+), 2 deletions(-) rename {waku/v2 => cmd/waku}/rest/debug.go (100%) rename {waku/v2 => cmd/waku}/rest/debug_api.yaml (100%) rename {waku/v2 => cmd/waku}/rest/debug_test.go (100%) rename {waku/v2 => cmd/waku}/rest/relay.go (100%) rename {waku/v2 => cmd/waku}/rest/relay_api.yaml (100%) rename {waku/v2 => cmd/waku}/rest/relay_test.go (100%) rename {waku/v2 => cmd/waku}/rest/runner.go (100%) rename {waku/v2 => cmd/waku}/rest/store.go (100%) rename {waku/v2 => cmd/waku}/rest/store_api.yaml (100%) rename {waku/v2 => cmd/waku}/rest/store_test.go (100%) rename {waku/v2 => cmd/waku}/rest/utils.go (100%) rename {waku/v2 => cmd/waku}/rest/utils_test.go (100%) rename {waku/v2 => cmd/waku}/rest/waku_rest.go (100%) rename {waku/v2 => cmd/waku}/rest/waku_rest_test.go (100%) rename {waku/v2 => cmd/waku}/rpc/admin.go (100%) rename {waku/v2 => cmd/waku}/rpc/admin_test.go (100%) rename {waku/v2 => cmd/waku}/rpc/codec.go (100%) rename {waku/v2 => cmd/waku}/rpc/coded_test.go (100%) rename {waku/v2 => cmd/waku}/rpc/debug.go (100%) rename {waku/v2 => cmd/waku}/rpc/debug_test.go (100%) rename {waku/v2 => cmd/waku}/rpc/filter.go (100%) rename {waku/v2 => cmd/waku}/rpc/filter_test.go (100%) rename {waku/v2 => cmd/waku}/rpc/private.go (100%) rename {waku/v2 => cmd/waku}/rpc/private_test.go (100%) rename {waku/v2 => cmd/waku}/rpc/relay.go (100%) rename {waku/v2 => cmd/waku}/rpc/relay_test.go (100%) rename {waku/v2 => cmd/waku}/rpc/rpc_type.go (100%) rename {waku/v2 => cmd/waku}/rpc/runner.go (100%) rename {waku/v2 => cmd/waku}/rpc/store.go (100%) rename {waku/v2 => cmd/waku}/rpc/store_test.go (100%) rename {waku/v2 => cmd/waku}/rpc/util_test.go (100%) rename {waku/v2 => cmd/waku}/rpc/utils.go (100%) rename {waku/v2 => cmd/waku}/rpc/waku_rpc.go (100%) rename {waku/v2 => cmd/waku}/rpc/waku_rpc_test.go (100%) diff --git a/cmd/waku/node.go b/cmd/waku/node.go index bb91ba1c..2043382c 100644 --- a/cmd/waku/node.go +++ b/cmd/waku/node.go @@ -42,6 +42,8 @@ import ( "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds" ws "github.com/libp2p/go-libp2p/p2p/transport/websocket" "github.com/multiformats/go-multiaddr" + "github.com/waku-org/go-waku/cmd/waku/rest" + "github.com/waku-org/go-waku/cmd/waku/rpc" "github.com/waku-org/go-waku/logging" "github.com/waku-org/go-waku/waku/metrics" "github.com/waku-org/go-waku/waku/persistence" @@ -53,8 +55,6 @@ import ( "github.com/waku-org/go-waku/waku/v2/protocol/peer_exchange" "github.com/waku-org/go-waku/waku/v2/protocol/relay" "github.com/waku-org/go-waku/waku/v2/protocol/store" - "github.com/waku-org/go-waku/waku/v2/rest" - "github.com/waku-org/go-waku/waku/v2/rpc" "github.com/waku-org/go-waku/waku/v2/utils" ) diff --git a/waku/v2/rest/debug.go b/cmd/waku/rest/debug.go similarity index 100% rename from waku/v2/rest/debug.go rename to cmd/waku/rest/debug.go diff --git a/waku/v2/rest/debug_api.yaml b/cmd/waku/rest/debug_api.yaml similarity index 100% rename from waku/v2/rest/debug_api.yaml rename to cmd/waku/rest/debug_api.yaml diff --git a/waku/v2/rest/debug_test.go b/cmd/waku/rest/debug_test.go similarity index 100% rename from waku/v2/rest/debug_test.go rename to cmd/waku/rest/debug_test.go diff --git a/waku/v2/rest/relay.go b/cmd/waku/rest/relay.go similarity index 100% rename from waku/v2/rest/relay.go rename to cmd/waku/rest/relay.go diff --git a/waku/v2/rest/relay_api.yaml b/cmd/waku/rest/relay_api.yaml similarity index 100% rename from waku/v2/rest/relay_api.yaml rename to cmd/waku/rest/relay_api.yaml diff --git a/waku/v2/rest/relay_test.go b/cmd/waku/rest/relay_test.go similarity index 100% rename from waku/v2/rest/relay_test.go rename to cmd/waku/rest/relay_test.go diff --git a/waku/v2/rest/runner.go b/cmd/waku/rest/runner.go similarity index 100% rename from waku/v2/rest/runner.go rename to cmd/waku/rest/runner.go diff --git a/waku/v2/rest/store.go b/cmd/waku/rest/store.go similarity index 100% rename from waku/v2/rest/store.go rename to cmd/waku/rest/store.go diff --git a/waku/v2/rest/store_api.yaml b/cmd/waku/rest/store_api.yaml similarity index 100% rename from waku/v2/rest/store_api.yaml rename to cmd/waku/rest/store_api.yaml diff --git a/waku/v2/rest/store_test.go b/cmd/waku/rest/store_test.go similarity index 100% rename from waku/v2/rest/store_test.go rename to cmd/waku/rest/store_test.go diff --git a/waku/v2/rest/utils.go b/cmd/waku/rest/utils.go similarity index 100% rename from waku/v2/rest/utils.go rename to cmd/waku/rest/utils.go diff --git a/waku/v2/rest/utils_test.go b/cmd/waku/rest/utils_test.go similarity index 100% rename from waku/v2/rest/utils_test.go rename to cmd/waku/rest/utils_test.go diff --git a/waku/v2/rest/waku_rest.go b/cmd/waku/rest/waku_rest.go similarity index 100% rename from waku/v2/rest/waku_rest.go rename to cmd/waku/rest/waku_rest.go diff --git a/waku/v2/rest/waku_rest_test.go b/cmd/waku/rest/waku_rest_test.go similarity index 100% rename from waku/v2/rest/waku_rest_test.go rename to cmd/waku/rest/waku_rest_test.go diff --git a/waku/v2/rpc/admin.go b/cmd/waku/rpc/admin.go similarity index 100% rename from waku/v2/rpc/admin.go rename to cmd/waku/rpc/admin.go diff --git a/waku/v2/rpc/admin_test.go b/cmd/waku/rpc/admin_test.go similarity index 100% rename from waku/v2/rpc/admin_test.go rename to cmd/waku/rpc/admin_test.go diff --git a/waku/v2/rpc/codec.go b/cmd/waku/rpc/codec.go similarity index 100% rename from waku/v2/rpc/codec.go rename to cmd/waku/rpc/codec.go diff --git a/waku/v2/rpc/coded_test.go b/cmd/waku/rpc/coded_test.go similarity index 100% rename from waku/v2/rpc/coded_test.go rename to cmd/waku/rpc/coded_test.go diff --git a/waku/v2/rpc/debug.go b/cmd/waku/rpc/debug.go similarity index 100% rename from waku/v2/rpc/debug.go rename to cmd/waku/rpc/debug.go diff --git a/waku/v2/rpc/debug_test.go b/cmd/waku/rpc/debug_test.go similarity index 100% rename from waku/v2/rpc/debug_test.go rename to cmd/waku/rpc/debug_test.go diff --git a/waku/v2/rpc/filter.go b/cmd/waku/rpc/filter.go similarity index 100% rename from waku/v2/rpc/filter.go rename to cmd/waku/rpc/filter.go diff --git a/waku/v2/rpc/filter_test.go b/cmd/waku/rpc/filter_test.go similarity index 100% rename from waku/v2/rpc/filter_test.go rename to cmd/waku/rpc/filter_test.go diff --git a/waku/v2/rpc/private.go b/cmd/waku/rpc/private.go similarity index 100% rename from waku/v2/rpc/private.go rename to cmd/waku/rpc/private.go diff --git a/waku/v2/rpc/private_test.go b/cmd/waku/rpc/private_test.go similarity index 100% rename from waku/v2/rpc/private_test.go rename to cmd/waku/rpc/private_test.go diff --git a/waku/v2/rpc/relay.go b/cmd/waku/rpc/relay.go similarity index 100% rename from waku/v2/rpc/relay.go rename to cmd/waku/rpc/relay.go diff --git a/waku/v2/rpc/relay_test.go b/cmd/waku/rpc/relay_test.go similarity index 100% rename from waku/v2/rpc/relay_test.go rename to cmd/waku/rpc/relay_test.go diff --git a/waku/v2/rpc/rpc_type.go b/cmd/waku/rpc/rpc_type.go similarity index 100% rename from waku/v2/rpc/rpc_type.go rename to cmd/waku/rpc/rpc_type.go diff --git a/waku/v2/rpc/runner.go b/cmd/waku/rpc/runner.go similarity index 100% rename from waku/v2/rpc/runner.go rename to cmd/waku/rpc/runner.go diff --git a/waku/v2/rpc/store.go b/cmd/waku/rpc/store.go similarity index 100% rename from waku/v2/rpc/store.go rename to cmd/waku/rpc/store.go diff --git a/waku/v2/rpc/store_test.go b/cmd/waku/rpc/store_test.go similarity index 100% rename from waku/v2/rpc/store_test.go rename to cmd/waku/rpc/store_test.go diff --git a/waku/v2/rpc/util_test.go b/cmd/waku/rpc/util_test.go similarity index 100% rename from waku/v2/rpc/util_test.go rename to cmd/waku/rpc/util_test.go diff --git a/waku/v2/rpc/utils.go b/cmd/waku/rpc/utils.go similarity index 100% rename from waku/v2/rpc/utils.go rename to cmd/waku/rpc/utils.go diff --git a/waku/v2/rpc/waku_rpc.go b/cmd/waku/rpc/waku_rpc.go similarity index 100% rename from waku/v2/rpc/waku_rpc.go rename to cmd/waku/rpc/waku_rpc.go diff --git a/waku/v2/rpc/waku_rpc_test.go b/cmd/waku/rpc/waku_rpc_test.go similarity index 100% rename from waku/v2/rpc/waku_rpc_test.go rename to cmd/waku/rpc/waku_rpc_test.go