diff --git a/faucet/faucet.go b/faucet/faucet.go index c7d12eeb0..6296f88a8 100644 --- a/faucet/faucet.go +++ b/faucet/faucet.go @@ -5,19 +5,20 @@ import ( "encoding/hex" "encoding/json" "fmt" + "io/ioutil" + "net/http" + "net/url" + "path" + "github.com/kaspanet/kaspad/blockdag" "github.com/kaspanet/kaspad/faucet/config" "github.com/kaspanet/kaspad/httpserverutils" - "github.com/kaspanet/kaspad/kasparov/server/apimodels" + "github.com/kaspanet/kaspad/kasparov/kasparovd/apimodels" "github.com/kaspanet/kaspad/txscript" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/wire" "github.com/pkg/errors" - "io/ioutil" - "net/http" - "net/url" - "path" ) const ( diff --git a/kasparov/server/apimodels/request_types.go b/kasparov/kasparovd/apimodels/request_types.go similarity index 100% rename from kasparov/server/apimodels/request_types.go rename to kasparov/kasparovd/apimodels/request_types.go diff --git a/kasparov/server/apimodels/response_types.go b/kasparov/kasparovd/apimodels/response_types.go similarity index 100% rename from kasparov/server/apimodels/response_types.go rename to kasparov/kasparovd/apimodels/response_types.go diff --git a/kasparov/server/config/config.go b/kasparov/kasparovd/config/config.go similarity index 100% rename from kasparov/server/config/config.go rename to kasparov/kasparovd/config/config.go diff --git a/kasparov/server/controllers/block.go b/kasparov/kasparovd/controllers/block.go similarity index 98% rename from kasparov/server/controllers/block.go rename to kasparov/kasparovd/controllers/block.go index f4a7a1765..ccafab0a9 100644 --- a/kasparov/server/controllers/block.go +++ b/kasparov/kasparovd/controllers/block.go @@ -2,10 +2,11 @@ package controllers import ( "encoding/hex" + "net/http" + "github.com/kaspanet/kaspad/kasparov/database" "github.com/kaspanet/kaspad/kasparov/dbmodels" - "github.com/kaspanet/kaspad/kasparov/server/apimodels" - "net/http" + "github.com/kaspanet/kaspad/kasparov/kasparovd/apimodels" "github.com/kaspanet/kaspad/httpserverutils" "github.com/pkg/errors" diff --git a/kasparov/server/controllers/common.go b/kasparov/kasparovd/controllers/common.go similarity index 97% rename from kasparov/server/controllers/common.go rename to kasparov/kasparovd/controllers/common.go index 8d45d4c0f..91b598d88 100644 --- a/kasparov/server/controllers/common.go +++ b/kasparov/kasparovd/controllers/common.go @@ -2,9 +2,10 @@ package controllers import ( "encoding/hex" + "github.com/kaspanet/kaspad/btcjson" "github.com/kaspanet/kaspad/kasparov/dbmodels" - "github.com/kaspanet/kaspad/kasparov/server/apimodels" + "github.com/kaspanet/kaspad/kasparov/kasparovd/apimodels" ) func convertTxDBModelToTxResponse(tx *dbmodels.Transaction) *apimodels.TransactionResponse { diff --git a/kasparov/server/controllers/feeestimate.go b/kasparov/kasparovd/controllers/feeestimate.go similarity index 82% rename from kasparov/server/controllers/feeestimate.go rename to kasparov/kasparovd/controllers/feeestimate.go index c8fb96e97..d82885bc9 100644 --- a/kasparov/server/controllers/feeestimate.go +++ b/kasparov/kasparovd/controllers/feeestimate.go @@ -1,8 +1,6 @@ package controllers -import ( - "github.com/kaspanet/kaspad/kasparov/server/apimodels" -) +import "github.com/kaspanet/kaspad/kasparov/kasparovd/apimodels" // GetFeeEstimatesHandler returns the fee estimates for different priorities // for accepting a transaction in the DAG. diff --git a/kasparov/server/controllers/transaction.go b/kasparov/kasparovd/controllers/transaction.go similarity index 99% rename from kasparov/server/controllers/transaction.go rename to kasparov/kasparovd/controllers/transaction.go index 91f1902b3..d9e8d3b76 100644 --- a/kasparov/server/controllers/transaction.go +++ b/kasparov/kasparovd/controllers/transaction.go @@ -5,16 +5,17 @@ import ( "encoding/hex" "encoding/json" "fmt" + "net/http" + "github.com/kaspanet/kaspad/kasparov/database" "github.com/kaspanet/kaspad/kasparov/dbmodels" "github.com/kaspanet/kaspad/kasparov/jsonrpc" - "github.com/kaspanet/kaspad/kasparov/server/apimodels" + "github.com/kaspanet/kaspad/kasparov/kasparovd/apimodels" + "github.com/kaspanet/kaspad/kasparov/kasparovd/config" "github.com/kaspanet/kaspad/util" - "net/http" "github.com/kaspanet/kaspad/blockdag" "github.com/kaspanet/kaspad/httpserverutils" - "github.com/kaspanet/kaspad/kasparov/server/config" "github.com/kaspanet/kaspad/util/subnetworkid" "github.com/pkg/errors" diff --git a/kasparov/server/docker/Dockerfile b/kasparov/kasparovd/docker/Dockerfile similarity index 87% rename from kasparov/server/docker/Dockerfile rename to kasparov/kasparovd/docker/Dockerfile index 4cb20e794..6fd93f688 100644 --- a/kasparov/server/docker/Dockerfile +++ b/kasparov/kasparovd/docker/Dockerfile @@ -22,7 +22,7 @@ WORKDIR /app RUN apk add --no-cache tini -COPY --from=build /go/src/github.com/kaspanet/kaspad/kasparov/server/ /app/ +COPY --from=build /go/src/github.com/kaspanet/kaspad/kasparov/kasparovd/ /app/ ENTRYPOINT ["/sbin/tini", "--"] CMD ["/app/kasparov-server"] diff --git a/kasparov/server/log.go b/kasparov/kasparovd/log.go similarity index 100% rename from kasparov/server/log.go rename to kasparov/kasparovd/log.go diff --git a/kasparov/server/main.go b/kasparov/kasparovd/main.go similarity index 91% rename from kasparov/server/main.go rename to kasparov/kasparovd/main.go index 01781defa..ae42ac15f 100644 --- a/kasparov/server/main.go +++ b/kasparov/kasparovd/main.go @@ -2,16 +2,17 @@ package main import ( "fmt" - "github.com/pkg/errors" "os" + "github.com/pkg/errors" + _ "github.com/golang-migrate/migrate/v4/database/mysql" _ "github.com/golang-migrate/migrate/v4/source/file" _ "github.com/jinzhu/gorm/dialects/mysql" "github.com/kaspanet/kaspad/kasparov/database" "github.com/kaspanet/kaspad/kasparov/jsonrpc" - "github.com/kaspanet/kaspad/kasparov/server/config" - "github.com/kaspanet/kaspad/kasparov/server/server" + "github.com/kaspanet/kaspad/kasparov/kasparovd/config" + "github.com/kaspanet/kaspad/kasparov/kasparovd/server" "github.com/kaspanet/kaspad/signal" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/kasparov/server/server/log.go b/kasparov/kasparovd/server/log.go similarity index 100% rename from kasparov/server/server/log.go rename to kasparov/kasparovd/server/log.go diff --git a/kasparov/server/server/routes.go b/kasparov/kasparovd/server/routes.go similarity index 98% rename from kasparov/server/server/routes.go rename to kasparov/kasparovd/server/routes.go index e5715aff5..a14b2987d 100644 --- a/kasparov/server/server/routes.go +++ b/kasparov/kasparovd/server/routes.go @@ -2,13 +2,14 @@ package server import ( "fmt" - "github.com/kaspanet/kaspad/httpserverutils" - "github.com/pkg/errors" "net/http" "strconv" + "github.com/kaspanet/kaspad/httpserverutils" + "github.com/kaspanet/kaspad/kasparov/kasparovd/controllers" + "github.com/pkg/errors" + "github.com/gorilla/mux" - "github.com/kaspanet/kaspad/kasparov/server/controllers" ) const ( diff --git a/kasparov/server/server/server.go b/kasparov/kasparovd/server/server.go similarity index 100% rename from kasparov/server/server/server.go rename to kasparov/kasparovd/server/server.go diff --git a/kasparov/syncd/config/config.go b/kasparov/kasparovsync/config/config.go similarity index 100% rename from kasparov/syncd/config/config.go rename to kasparov/kasparovsync/config/config.go diff --git a/kasparov/syncd/docker/Dockerfile b/kasparov/kasparovsync/docker/Dockerfile similarity index 86% rename from kasparov/syncd/docker/Dockerfile rename to kasparov/kasparovsync/docker/Dockerfile index bb219287d..4a15a6e7c 100644 --- a/kasparov/syncd/docker/Dockerfile +++ b/kasparov/kasparovsync/docker/Dockerfile @@ -22,7 +22,7 @@ WORKDIR /app RUN apk add --no-cache tini -COPY --from=build /go/src/github.com/kaspanet/kaspad/kasparov/syncd/ /app/ +COPY --from=build /go/src/github.com/kaspanet/kaspad/kasparov/kasparovsync/ /app/ ENTRYPOINT ["/sbin/tini", "--"] CMD ["/app/kasparov-syncd"] diff --git a/kasparov/syncd/log.go b/kasparov/kasparovsync/log.go similarity index 100% rename from kasparov/syncd/log.go rename to kasparov/kasparovsync/log.go diff --git a/kasparov/syncd/main.go b/kasparov/kasparovsync/main.go similarity index 93% rename from kasparov/syncd/main.go rename to kasparov/kasparovsync/main.go index 6dddd5b6d..70c303ee4 100644 --- a/kasparov/syncd/main.go +++ b/kasparov/kasparovsync/main.go @@ -2,17 +2,18 @@ package main import ( "fmt" + "os" + _ "github.com/golang-migrate/migrate/v4/database/mysql" _ "github.com/golang-migrate/migrate/v4/source/file" _ "github.com/jinzhu/gorm/dialects/mysql" "github.com/kaspanet/kaspad/kasparov/database" "github.com/kaspanet/kaspad/kasparov/jsonrpc" - "github.com/kaspanet/kaspad/kasparov/syncd/config" - "github.com/kaspanet/kaspad/kasparov/syncd/mqtt" + "github.com/kaspanet/kaspad/kasparov/kasparovsync/config" + "github.com/kaspanet/kaspad/kasparov/kasparovsync/mqtt" "github.com/kaspanet/kaspad/signal" "github.com/kaspanet/kaspad/util/panics" "github.com/pkg/errors" - "os" ) func main() { diff --git a/kasparov/syncd/mqtt/log.go b/kasparov/kasparovsync/mqtt/log.go similarity index 100% rename from kasparov/syncd/mqtt/log.go rename to kasparov/kasparovsync/mqtt/log.go diff --git a/kasparov/syncd/mqtt/mqtt.go b/kasparov/kasparovsync/mqtt/mqtt.go similarity index 96% rename from kasparov/syncd/mqtt/mqtt.go rename to kasparov/kasparovsync/mqtt/mqtt.go index cd4008775..9477206af 100644 --- a/kasparov/syncd/mqtt/mqtt.go +++ b/kasparov/kasparovsync/mqtt/mqtt.go @@ -2,8 +2,9 @@ package mqtt import ( "encoding/json" + mqtt "github.com/eclipse/paho.mqtt.golang" - "github.com/kaspanet/kaspad/kasparov/syncd/config" + "github.com/kaspanet/kaspad/kasparov/kasparovsync/config" "github.com/pkg/errors" ) diff --git a/kasparov/syncd/mqtt/selected_tip.go b/kasparov/kasparovsync/mqtt/selected_tip.go similarity index 84% rename from kasparov/syncd/mqtt/selected_tip.go rename to kasparov/kasparovsync/mqtt/selected_tip.go index 119bac4aa..65634a6b8 100644 --- a/kasparov/syncd/mqtt/selected_tip.go +++ b/kasparov/kasparovsync/mqtt/selected_tip.go @@ -1,8 +1,6 @@ package mqtt -import ( - "github.com/kaspanet/kaspad/kasparov/server/controllers" -) +import "github.com/kaspanet/kaspad/kasparov/kasparovd/controllers" const selectedTipTopic = "dag/selected-tip" diff --git a/kasparov/syncd/mqtt/transactions.go b/kasparov/kasparovsync/mqtt/transactions.go similarity index 96% rename from kasparov/syncd/mqtt/transactions.go rename to kasparov/kasparovsync/mqtt/transactions.go index ce75cab6e..023fe4fa1 100644 --- a/kasparov/syncd/mqtt/transactions.go +++ b/kasparov/kasparovsync/mqtt/transactions.go @@ -1,12 +1,13 @@ package mqtt import ( + "path" + "github.com/kaspanet/kaspad/btcjson" - "github.com/kaspanet/kaspad/kasparov/server/apimodels" - "github.com/kaspanet/kaspad/kasparov/server/controllers" + "github.com/kaspanet/kaspad/kasparov/kasparovd/apimodels" + "github.com/kaspanet/kaspad/kasparov/kasparovd/controllers" "github.com/kaspanet/kaspad/rpcclient" "github.com/kaspanet/kaspad/util/daghash" - "path" ) // PublishTransactionsNotifications publishes notification for each transaction of the given block diff --git a/kasparov/syncd/sync.go b/kasparov/kasparovsync/sync.go similarity index 99% rename from kasparov/syncd/sync.go rename to kasparov/kasparovsync/sync.go index 64ad41822..d797da90d 100644 --- a/kasparov/syncd/sync.go +++ b/kasparov/kasparovsync/sync.go @@ -3,15 +3,16 @@ package main import ( "bytes" "encoding/hex" - "github.com/kaspanet/kaspad/kasparov/database" - "github.com/kaspanet/kaspad/kasparov/dbmodels" - "github.com/kaspanet/kaspad/kasparov/jsonrpc" - "github.com/kaspanet/kaspad/kasparov/syncd/config" - "github.com/kaspanet/kaspad/kasparov/syncd/mqtt" "strconv" "strings" "time" + "github.com/kaspanet/kaspad/kasparov/database" + "github.com/kaspanet/kaspad/kasparov/dbmodels" + "github.com/kaspanet/kaspad/kasparov/jsonrpc" + "github.com/kaspanet/kaspad/kasparov/kasparovsync/config" + "github.com/kaspanet/kaspad/kasparov/kasparovsync/mqtt" + "github.com/jinzhu/gorm" "github.com/kaspanet/kaspad/blockdag" "github.com/kaspanet/kaspad/btcjson"