diff --git a/app/app.go b/app/app.go index 71cc73a31..0c4c5e5b9 100644 --- a/app/app.go +++ b/app/app.go @@ -4,24 +4,24 @@ import ( "fmt" "sync/atomic" - "github.com/kaspanet/kaspad/addressmanager" + "github.com/kaspanet/kaspad/network/addressmanager" - "github.com/kaspanet/kaspad/netadapter/id" + "github.com/kaspanet/kaspad/network/netadapter/id" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/blockdag/indexers" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/connmanager" - "github.com/kaspanet/kaspad/dbaccess" - "github.com/kaspanet/kaspad/dnsseed" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/mempool" - "github.com/kaspanet/kaspad/mining" - "github.com/kaspanet/kaspad/netadapter" - "github.com/kaspanet/kaspad/protocol" - "github.com/kaspanet/kaspad/rpc" - "github.com/kaspanet/kaspad/signal" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/blockdag/indexers" + "github.com/kaspanet/kaspad/domain/mempool" + "github.com/kaspanet/kaspad/domain/mining" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/signal" + "github.com/kaspanet/kaspad/network/connmanager" + "github.com/kaspanet/kaspad/network/dnsseed" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter" + "github.com/kaspanet/kaspad/network/protocol" + "github.com/kaspanet/kaspad/network/rpc" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/app/log.go b/app/log.go index 19f956012..a79ef3ad7 100644 --- a/app/log.go +++ b/app/log.go @@ -6,7 +6,7 @@ package app import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/cmd/addblock/addblock.go b/cmd/addblock/addblock.go index 4b2d91ace..8edf42f93 100644 --- a/cmd/addblock/addblock.go +++ b/cmd/addblock/addblock.go @@ -8,8 +8,8 @@ import ( "os" "runtime" - "github.com/kaspanet/kaspad/limits" - "github.com/kaspanet/kaspad/logs" + "github.com/kaspanet/kaspad/infrastructure/limits" + "github.com/kaspanet/kaspad/infrastructure/logs" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/cmd/addblock/config.go b/cmd/addblock/config.go index 4d1a586a6..821f1515b 100644 --- a/cmd/addblock/config.go +++ b/cmd/addblock/config.go @@ -7,7 +7,7 @@ package main import ( "fmt" flags "github.com/jessevdk/go-flags" - "github.com/kaspanet/kaspad/config" + "github.com/kaspanet/kaspad/infrastructure/config" "github.com/kaspanet/kaspad/util" "github.com/pkg/errors" "os" diff --git a/cmd/addblock/import.go b/cmd/addblock/import.go index 1290e9319..9d2897551 100644 --- a/cmd/addblock/import.go +++ b/cmd/addblock/import.go @@ -6,15 +6,15 @@ package main import ( "encoding/binary" - "github.com/kaspanet/kaspad/blockdag/indexers" + "github.com/kaspanet/kaspad/domain/blockdag/indexers" "github.com/kaspanet/kaspad/util/mstime" "github.com/pkg/errors" "io" "sync" "time" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" ) diff --git a/cmd/kaspactl/config.go b/cmd/kaspactl/config.go index 4cea58acf..dbdd8f31c 100644 --- a/cmd/kaspactl/config.go +++ b/cmd/kaspactl/config.go @@ -6,8 +6,8 @@ package main import ( "fmt" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/version" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/infrastructure/version" "github.com/pkg/errors" "io/ioutil" "os" @@ -16,7 +16,7 @@ import ( "strings" "github.com/jessevdk/go-flags" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" ) diff --git a/cmd/kaspactl/httpclient.go b/cmd/kaspactl/httpclient.go index b54e30c97..844a6bb91 100644 --- a/cmd/kaspactl/httpclient.go +++ b/cmd/kaspactl/httpclient.go @@ -11,7 +11,7 @@ import ( "net/http" "github.com/btcsuite/go-socks/socks" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // newHTTPClient returns a new HTTP client that is configured according to the diff --git a/cmd/kaspactl/kaspactl.go b/cmd/kaspactl/kaspactl.go index bc4d4498d..18082d7e9 100644 --- a/cmd/kaspactl/kaspactl.go +++ b/cmd/kaspactl/kaspactl.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) const ( diff --git a/cmd/kaspaminer/client.go b/cmd/kaspaminer/client.go index 2b89e1a28..76b8b588d 100644 --- a/cmd/kaspaminer/client.go +++ b/cmd/kaspaminer/client.go @@ -1,8 +1,8 @@ package main import ( - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/rpc/client" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/rpc/client" "github.com/kaspanet/kaspad/util" "github.com/pkg/errors" "io/ioutil" diff --git a/cmd/kaspaminer/config.go b/cmd/kaspaminer/config.go index 392eb70ca..79c06574f 100644 --- a/cmd/kaspaminer/config.go +++ b/cmd/kaspaminer/config.go @@ -7,13 +7,13 @@ import ( "strconv" "strings" - "github.com/kaspanet/kaspad/config" + "github.com/kaspanet/kaspad/infrastructure/config" "github.com/kaspanet/kaspad/util" "github.com/pkg/errors" "github.com/jessevdk/go-flags" - "github.com/kaspanet/kaspad/version" + "github.com/kaspanet/kaspad/infrastructure/version" ) const ( diff --git a/cmd/kaspaminer/log.go b/cmd/kaspaminer/log.go index 55de49fa5..978590230 100644 --- a/cmd/kaspaminer/log.go +++ b/cmd/kaspaminer/log.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "github.com/kaspanet/kaspad/logs" - "github.com/kaspanet/kaspad/rpc/client" + "github.com/kaspanet/kaspad/infrastructure/logs" + "github.com/kaspanet/kaspad/network/rpc/client" "github.com/kaspanet/kaspad/util/panics" "os" ) diff --git a/cmd/kaspaminer/main.go b/cmd/kaspaminer/main.go index 483caadc3..7ed83f11f 100644 --- a/cmd/kaspaminer/main.go +++ b/cmd/kaspaminer/main.go @@ -5,13 +5,13 @@ import ( "github.com/kaspanet/kaspad/util" "os" - "github.com/kaspanet/kaspad/version" + "github.com/kaspanet/kaspad/infrastructure/version" "github.com/pkg/errors" _ "net/http/pprof" - "github.com/kaspanet/kaspad/signal" + "github.com/kaspanet/kaspad/infrastructure/signal" "github.com/kaspanet/kaspad/util/panics" "github.com/kaspanet/kaspad/util/profiling" ) diff --git a/cmd/kaspaminer/mineloop.go b/cmd/kaspaminer/mineloop.go index 26656c713..6755ecc81 100644 --- a/cmd/kaspaminer/mineloop.go +++ b/cmd/kaspaminer/mineloop.go @@ -7,8 +7,8 @@ import ( "sync/atomic" "time" - clientpkg "github.com/kaspanet/kaspad/rpc/client" - "github.com/kaspanet/kaspad/rpc/model" + clientpkg "github.com/kaspanet/kaspad/network/rpc/client" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" diff --git a/cmd/txsigner/config.go b/cmd/txsigner/config.go index 707e0b9ad..54cd0e1c5 100644 --- a/cmd/txsigner/config.go +++ b/cmd/txsigner/config.go @@ -2,7 +2,7 @@ package main import ( "github.com/jessevdk/go-flags" - "github.com/kaspanet/kaspad/config" + "github.com/kaspanet/kaspad/infrastructure/config" ) var activeConfig *ConfigFlags diff --git a/cmd/txsigner/txsigner.go b/cmd/txsigner/txsigner.go index 085ce4a98..53b8c0bc7 100644 --- a/cmd/txsigner/txsigner.go +++ b/cmd/txsigner/txsigner.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "fmt" "github.com/kaspanet/go-secp256k1" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/pkg/errors" "os" diff --git a/blockdag/README.md b/domain/blockdag/README.md similarity index 100% rename from blockdag/README.md rename to domain/blockdag/README.md diff --git a/blockdag/behavior_flags.go b/domain/blockdag/behavior_flags.go similarity index 100% rename from blockdag/behavior_flags.go rename to domain/blockdag/behavior_flags.go diff --git a/blockdag/block_utxo.go b/domain/blockdag/block_utxo.go similarity index 100% rename from blockdag/block_utxo.go rename to domain/blockdag/block_utxo.go diff --git a/blockdag/blockheap.go b/domain/blockdag/blockheap.go similarity index 100% rename from blockdag/blockheap.go rename to domain/blockdag/blockheap.go diff --git a/blockdag/blockheap_test.go b/domain/blockdag/blockheap_test.go similarity index 98% rename from blockdag/blockheap_test.go rename to domain/blockdag/blockheap_test.go index b85e826dc..9e70e6c7a 100644 --- a/blockdag/blockheap_test.go +++ b/domain/blockdag/blockheap_test.go @@ -3,7 +3,7 @@ package blockdag import ( "testing" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/blockindex.go b/domain/blockdag/blockindex.go similarity index 97% rename from blockdag/blockindex.go rename to domain/blockdag/blockindex.go index ed8c28cd7..938b2052b 100644 --- a/blockdag/blockindex.go +++ b/domain/blockdag/blockindex.go @@ -6,11 +6,11 @@ package blockdag import ( "fmt" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/kaspanet/kaspad/util" "sync" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/blockindex_test.go b/domain/blockdag/blockindex_test.go similarity index 93% rename from blockdag/blockindex_test.go rename to domain/blockdag/blockindex_test.go index dc3d2c997..c759b5832 100644 --- a/blockdag/blockindex_test.go +++ b/domain/blockdag/blockindex_test.go @@ -1,7 +1,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util/mstime" "testing" ) diff --git a/blockdag/blocklocator.go b/domain/blockdag/blocklocator.go similarity index 99% rename from blockdag/blocklocator.go rename to domain/blockdag/blocklocator.go index f4141e257..a2df1090e 100644 --- a/blockdag/blocklocator.go +++ b/domain/blockdag/blocklocator.go @@ -1,7 +1,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" ) diff --git a/blockdag/blocknode.go b/domain/blockdag/blocknode.go similarity index 98% rename from blockdag/blocknode.go rename to domain/blockdag/blocknode.go index dcb157f67..3112a1725 100644 --- a/blockdag/blocknode.go +++ b/domain/blockdag/blocknode.go @@ -8,11 +8,11 @@ import ( "fmt" "math" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util/mstime" "github.com/pkg/errors" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/blocknode_test.go b/domain/blockdag/blocknode_test.go similarity index 96% rename from blockdag/blocknode_test.go rename to domain/blockdag/blocknode_test.go index 079e6d1c2..b20346868 100644 --- a/blockdag/blocknode_test.go +++ b/domain/blockdag/blocknode_test.go @@ -1,7 +1,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util/daghash" "testing" ) diff --git a/blockdag/blockset.go b/domain/blockdag/blockset.go similarity index 100% rename from blockdag/blockset.go rename to domain/blockdag/blockset.go diff --git a/blockdag/blockset_test.go b/domain/blockdag/blockset_test.go similarity index 100% rename from blockdag/blockset_test.go rename to domain/blockdag/blockset_test.go diff --git a/blockdag/blockwindow.go b/domain/blockdag/blockwindow.go similarity index 100% rename from blockdag/blockwindow.go rename to domain/blockdag/blockwindow.go diff --git a/blockdag/blockwindow_test.go b/domain/blockdag/blockwindow_test.go similarity index 99% rename from blockdag/blockwindow_test.go rename to domain/blockdag/blockwindow_test.go index 540f89253..06b9e1eae 100644 --- a/blockdag/blockwindow_test.go +++ b/domain/blockdag/blockwindow_test.go @@ -1,7 +1,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util" "github.com/pkg/errors" "reflect" diff --git a/blockdag/coinbase.go b/domain/blockdag/coinbase.go similarity index 98% rename from blockdag/coinbase.go rename to domain/blockdag/coinbase.go index 08d6758d9..2c33f97d2 100644 --- a/blockdag/coinbase.go +++ b/domain/blockdag/coinbase.go @@ -6,8 +6,8 @@ import ( "encoding/binary" "io" - "github.com/kaspanet/kaspad/dbaccess" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/coinbasepayload" "github.com/kaspanet/kaspad/util/daghash" diff --git a/blockdag/coinbase_test.go b/domain/blockdag/coinbase_test.go similarity index 100% rename from blockdag/coinbase_test.go rename to domain/blockdag/coinbase_test.go diff --git a/blockdag/common_test.go b/domain/blockdag/common_test.go similarity index 98% rename from blockdag/common_test.go rename to domain/blockdag/common_test.go index d6a11e2f7..319a245c0 100644 --- a/blockdag/common_test.go +++ b/domain/blockdag/common_test.go @@ -17,8 +17,8 @@ import ( "github.com/pkg/errors" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/config.go b/domain/blockdag/config.go similarity index 92% rename from blockdag/config.go rename to domain/blockdag/config.go index d5e3fbeb9..59340af7d 100644 --- a/blockdag/config.go +++ b/domain/blockdag/config.go @@ -1,9 +1,9 @@ package blockdag import ( - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/dbaccess" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/kaspanet/kaspad/util/subnetworkid" ) diff --git a/blockdag/confirmations.go b/domain/blockdag/confirmations.go similarity index 98% rename from blockdag/confirmations.go rename to domain/blockdag/confirmations.go index 9cbbdfe40..63023fc89 100644 --- a/blockdag/confirmations.go +++ b/domain/blockdag/confirmations.go @@ -1,7 +1,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" diff --git a/blockdag/dag.go b/domain/blockdag/dag.go similarity index 98% rename from blockdag/dag.go rename to domain/blockdag/dag.go index 6f9fced6f..ff687628b 100644 --- a/blockdag/dag.go +++ b/domain/blockdag/dag.go @@ -6,18 +6,18 @@ package blockdag import ( "fmt" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/mstime" "sync" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/pkg/errors" "github.com/kaspanet/kaspad/util/subnetworkid" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/domain/txscript" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/dag_test.go b/domain/blockdag/dag_test.go similarity index 99% rename from blockdag/dag_test.go rename to domain/blockdag/dag_test.go index 31a4e9db1..3fe2fe9f2 100644 --- a/blockdag/dag_test.go +++ b/domain/blockdag/dag_test.go @@ -14,12 +14,12 @@ import ( "time" "github.com/kaspanet/go-secp256k1" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/pkg/errors" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/subnetworkid" diff --git a/blockdag/dagio.go b/domain/blockdag/dagio.go similarity index 99% rename from blockdag/dagio.go rename to domain/blockdag/dagio.go index c349bf102..846ab37a2 100644 --- a/blockdag/dagio.go +++ b/domain/blockdag/dagio.go @@ -11,11 +11,11 @@ import ( "fmt" "io" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/pkg/errors" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/binaryserializer" "github.com/kaspanet/kaspad/util/daghash" diff --git a/blockdag/dagio_test.go b/domain/blockdag/dagio_test.go similarity index 100% rename from blockdag/dagio_test.go rename to domain/blockdag/dagio_test.go diff --git a/blockdag/delayed_blocks.go b/domain/blockdag/delayed_blocks.go similarity index 100% rename from blockdag/delayed_blocks.go rename to domain/blockdag/delayed_blocks.go diff --git a/blockdag/delayed_blocks_test.go b/domain/blockdag/delayed_blocks_test.go similarity index 95% rename from blockdag/delayed_blocks_test.go rename to domain/blockdag/delayed_blocks_test.go index 77755cc78..3cf54fb00 100644 --- a/blockdag/delayed_blocks_test.go +++ b/domain/blockdag/delayed_blocks_test.go @@ -1,7 +1,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util" "testing" "time" diff --git a/blockdag/delayedblockheap.go b/domain/blockdag/delayedblockheap.go similarity index 100% rename from blockdag/delayedblockheap.go rename to domain/blockdag/delayedblockheap.go diff --git a/blockdag/difficulty.go b/domain/blockdag/difficulty.go similarity index 100% rename from blockdag/difficulty.go rename to domain/blockdag/difficulty.go diff --git a/blockdag/difficulty_test.go b/domain/blockdag/difficulty_test.go similarity index 99% rename from blockdag/difficulty_test.go rename to domain/blockdag/difficulty_test.go index 9080c3cc8..f4afca658 100644 --- a/blockdag/difficulty_test.go +++ b/domain/blockdag/difficulty_test.go @@ -5,7 +5,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util/mstime" "math/big" "testing" diff --git a/blockdag/doc.go b/domain/blockdag/doc.go similarity index 100% rename from blockdag/doc.go rename to domain/blockdag/doc.go diff --git a/blockdag/error.go b/domain/blockdag/error.go similarity index 100% rename from blockdag/error.go rename to domain/blockdag/error.go diff --git a/blockdag/error_test.go b/domain/blockdag/error_test.go similarity index 100% rename from blockdag/error_test.go rename to domain/blockdag/error_test.go diff --git a/blockdag/external_dag_test.go b/domain/blockdag/external_dag_test.go similarity index 98% rename from blockdag/external_dag_test.go rename to domain/blockdag/external_dag_test.go index 311075691..7d74780d9 100644 --- a/blockdag/external_dag_test.go +++ b/domain/blockdag/external_dag_test.go @@ -13,11 +13,11 @@ import ( "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/testtools" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/mining" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/domain/mining" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" ) diff --git a/blockdag/finality.go b/domain/blockdag/finality.go similarity index 100% rename from blockdag/finality.go rename to domain/blockdag/finality.go diff --git a/blockdag/ghostdag.go b/domain/blockdag/ghostdag.go similarity index 99% rename from blockdag/ghostdag.go rename to domain/blockdag/ghostdag.go index 2aa96b28d..5d432166d 100644 --- a/blockdag/ghostdag.go +++ b/domain/blockdag/ghostdag.go @@ -1,7 +1,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/pkg/errors" "sort" ) diff --git a/blockdag/ghostdag_test.go b/domain/blockdag/ghostdag_test.go similarity index 99% rename from blockdag/ghostdag_test.go rename to domain/blockdag/ghostdag_test.go index 12e496148..228c56f9c 100644 --- a/blockdag/ghostdag_test.go +++ b/domain/blockdag/ghostdag_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/index_manager.go b/domain/blockdag/index_manager.go similarity index 92% rename from blockdag/index_manager.go rename to domain/blockdag/index_manager.go index 0fe12455b..a55ecc1a4 100644 --- a/blockdag/index_manager.go +++ b/domain/blockdag/index_manager.go @@ -1,7 +1,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/indexers/README.md b/domain/blockdag/indexers/README.md similarity index 100% rename from blockdag/indexers/README.md rename to domain/blockdag/indexers/README.md diff --git a/blockdag/indexers/acceptanceindex.go b/domain/blockdag/indexers/acceptanceindex.go similarity index 97% rename from blockdag/indexers/acceptanceindex.go rename to domain/blockdag/indexers/acceptanceindex.go index a6494add5..7a47ae372 100644 --- a/blockdag/indexers/acceptanceindex.go +++ b/domain/blockdag/indexers/acceptanceindex.go @@ -4,9 +4,9 @@ import ( "bytes" "encoding/gob" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/dbaccess" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/indexers/acceptanceindex_test.go b/domain/blockdag/indexers/acceptanceindex_test.go similarity index 97% rename from blockdag/indexers/acceptanceindex_test.go rename to domain/blockdag/indexers/acceptanceindex_test.go index cf6fe3b7f..c83b60444 100644 --- a/blockdag/indexers/acceptanceindex_test.go +++ b/domain/blockdag/indexers/acceptanceindex_test.go @@ -9,10 +9,10 @@ import ( "syscall" "testing" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/dbaccess" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" diff --git a/blockdag/indexers/indexer.go b/domain/blockdag/indexers/indexer.go similarity index 89% rename from blockdag/indexers/indexer.go rename to domain/blockdag/indexers/indexer.go index c87e6414f..5dac985f9 100644 --- a/blockdag/indexers/indexer.go +++ b/domain/blockdag/indexers/indexer.go @@ -8,8 +8,8 @@ Package indexers implements optional block DAG indexes. package indexers import ( - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/indexers/log.go b/domain/blockdag/indexers/log.go similarity index 81% rename from blockdag/indexers/log.go rename to domain/blockdag/indexers/log.go index 262e21828..15258a4a3 100644 --- a/blockdag/indexers/log.go +++ b/domain/blockdag/indexers/log.go @@ -5,7 +5,7 @@ package indexers import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" ) var log, _ = logger.Get(logger.SubsystemTags.INDX) diff --git a/blockdag/indexers/manager.go b/domain/blockdag/indexers/manager.go similarity index 95% rename from blockdag/indexers/manager.go rename to domain/blockdag/indexers/manager.go index a97ba11e4..c29e61f65 100644 --- a/blockdag/indexers/manager.go +++ b/domain/blockdag/indexers/manager.go @@ -5,8 +5,8 @@ package indexers import ( - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/log.go b/domain/blockdag/log.go similarity index 85% rename from blockdag/log.go rename to domain/blockdag/log.go index 40455502b..07cd8dc9f 100644 --- a/blockdag/log.go +++ b/domain/blockdag/log.go @@ -5,7 +5,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/blockdag/merkle.go b/domain/blockdag/merkle.go similarity index 100% rename from blockdag/merkle.go rename to domain/blockdag/merkle.go diff --git a/blockdag/merkle_test.go b/domain/blockdag/merkle_test.go similarity index 100% rename from blockdag/merkle_test.go rename to domain/blockdag/merkle_test.go diff --git a/blockdag/mining.go b/domain/blockdag/mining.go similarity index 97% rename from blockdag/mining.go rename to domain/blockdag/mining.go index 74443c1f9..8ae479d9a 100644 --- a/blockdag/mining.go +++ b/domain/blockdag/mining.go @@ -7,8 +7,8 @@ import ( "time" "github.com/kaspanet/go-secp256k1" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/mstime" diff --git a/blockdag/multiset.go b/domain/blockdag/multiset.go similarity index 97% rename from blockdag/multiset.go rename to domain/blockdag/multiset.go index 76bd88508..456b5b1ab 100644 --- a/blockdag/multiset.go +++ b/domain/blockdag/multiset.go @@ -2,7 +2,7 @@ package blockdag import ( "github.com/kaspanet/go-secp256k1" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/pkg/errors" ) diff --git a/blockdag/multisetio.go b/domain/blockdag/multisetio.go similarity index 100% rename from blockdag/multisetio.go rename to domain/blockdag/multisetio.go diff --git a/blockdag/multisetstore.go b/domain/blockdag/multisetstore.go similarity index 98% rename from blockdag/multisetstore.go rename to domain/blockdag/multisetstore.go index 8f9e67d82..0b2c9b8b9 100644 --- a/blockdag/multisetstore.go +++ b/domain/blockdag/multisetstore.go @@ -3,7 +3,7 @@ package blockdag import ( "bytes" "github.com/kaspanet/go-secp256k1" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/locks" "github.com/pkg/errors" diff --git a/blockdag/notifications.go b/domain/blockdag/notifications.go similarity index 100% rename from blockdag/notifications.go rename to domain/blockdag/notifications.go diff --git a/blockdag/notifications_test.go b/domain/blockdag/notifications_test.go similarity index 97% rename from blockdag/notifications_test.go rename to domain/blockdag/notifications_test.go index 749070048..9b2320d4b 100644 --- a/blockdag/notifications_test.go +++ b/domain/blockdag/notifications_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" ) // TestNotifications ensures that notification callbacks are fired on events. diff --git a/blockdag/orphan_blocks.go b/domain/blockdag/orphan_blocks.go similarity index 100% rename from blockdag/orphan_blocks.go rename to domain/blockdag/orphan_blocks.go diff --git a/blockdag/process.go b/domain/blockdag/process.go similarity index 99% rename from blockdag/process.go rename to domain/blockdag/process.go index f2015c1df..896f9da69 100644 --- a/blockdag/process.go +++ b/domain/blockdag/process.go @@ -3,7 +3,7 @@ package blockdag import ( "fmt" "github.com/kaspanet/go-secp256k1" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" diff --git a/blockdag/process_test.go b/domain/blockdag/process_test.go similarity index 99% rename from blockdag/process_test.go rename to domain/blockdag/process_test.go index e0d4c712b..124a2e84b 100644 --- a/blockdag/process_test.go +++ b/domain/blockdag/process_test.go @@ -8,7 +8,7 @@ import ( "github.com/kaspanet/kaspad/util" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/reachability.go b/domain/blockdag/reachability.go similarity index 99% rename from blockdag/reachability.go rename to domain/blockdag/reachability.go index 78cc82007..3f6a5122d 100644 --- a/blockdag/reachability.go +++ b/domain/blockdag/reachability.go @@ -2,7 +2,7 @@ package blockdag import ( "fmt" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/pkg/errors" "math" "strings" diff --git a/blockdag/reachability_test.go b/domain/blockdag/reachability_test.go similarity index 99% rename from blockdag/reachability_test.go rename to domain/blockdag/reachability_test.go index 07e03791a..c44949624 100644 --- a/blockdag/reachability_test.go +++ b/domain/blockdag/reachability_test.go @@ -1,7 +1,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util/daghash" "reflect" "strings" diff --git a/blockdag/reachabilitystore.go b/domain/blockdag/reachabilitystore.go similarity index 98% rename from blockdag/reachabilitystore.go rename to domain/blockdag/reachabilitystore.go index ce6ae7c36..4f609a4eb 100644 --- a/blockdag/reachabilitystore.go +++ b/domain/blockdag/reachabilitystore.go @@ -2,9 +2,9 @@ package blockdag import ( "bytes" - "github.com/kaspanet/kaspad/database" - "github.com/kaspanet/kaspad/dbaccess" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/infrastructure/database" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" "io" diff --git a/blockdag/scriptval.go b/domain/blockdag/scriptval.go similarity index 98% rename from blockdag/scriptval.go rename to domain/blockdag/scriptval.go index 7a5b2ae9f..f30fb79bc 100644 --- a/blockdag/scriptval.go +++ b/domain/blockdag/scriptval.go @@ -9,8 +9,8 @@ import ( "runtime" "time" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" ) diff --git a/blockdag/scriptval_test.go b/domain/blockdag/scriptval_test.go similarity index 96% rename from blockdag/scriptval_test.go rename to domain/blockdag/scriptval_test.go index 69820b219..80eb7bb04 100644 --- a/blockdag/scriptval_test.go +++ b/domain/blockdag/scriptval_test.go @@ -10,7 +10,7 @@ import ( "runtime" "testing" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/txscript" ) // TestCheckBlockScripts ensures that validating the all of the scripts in a diff --git a/blockdag/selected_parent_chain.go b/domain/blockdag/selected_parent_chain.go similarity index 100% rename from blockdag/selected_parent_chain.go rename to domain/blockdag/selected_parent_chain.go diff --git a/blockdag/sequence_lock.go b/domain/blockdag/sequence_lock.go similarity index 99% rename from blockdag/sequence_lock.go rename to domain/blockdag/sequence_lock.go index a2aa97c72..d6bb9b812 100644 --- a/blockdag/sequence_lock.go +++ b/domain/blockdag/sequence_lock.go @@ -2,7 +2,7 @@ package blockdag import ( "fmt" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" ) diff --git a/blockdag/subnetworks.go b/domain/blockdag/subnetworks.go similarity index 98% rename from blockdag/subnetworks.go rename to domain/blockdag/subnetworks.go index 2a0168071..1d7f343f8 100644 --- a/blockdag/subnetworks.go +++ b/domain/blockdag/subnetworks.go @@ -5,12 +5,12 @@ import ( "encoding/binary" "fmt" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/pkg/errors" "github.com/kaspanet/kaspad/util" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/subnetworkid" ) diff --git a/blockdag/subnetworks_test.go b/domain/blockdag/subnetworks_test.go similarity index 100% rename from blockdag/subnetworks_test.go rename to domain/blockdag/subnetworks_test.go diff --git a/blockdag/sync_rate.go b/domain/blockdag/sync_rate.go similarity index 100% rename from blockdag/sync_rate.go rename to domain/blockdag/sync_rate.go diff --git a/blockdag/sync_rate_test.go b/domain/blockdag/sync_rate_test.go similarity index 91% rename from blockdag/sync_rate_test.go rename to domain/blockdag/sync_rate_test.go index 826bd2146..dd6e8a2b8 100644 --- a/blockdag/sync_rate_test.go +++ b/domain/blockdag/sync_rate_test.go @@ -1,7 +1,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "testing" ) diff --git a/blockdag/test_utils.go b/domain/blockdag/test_utils.go similarity index 97% rename from blockdag/test_utils.go rename to domain/blockdag/test_utils.go index 9bdbc6607..5f2c76360 100644 --- a/blockdag/test_utils.go +++ b/domain/blockdag/test_utils.go @@ -14,16 +14,16 @@ import ( "sync" "testing" - "github.com/kaspanet/kaspad/database/ffldb/ldb" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/database/ffldb/ldb" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/kaspanet/kaspad/util" "github.com/pkg/errors" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/kaspanet/kaspad/util/subnetworkid" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/testdata/277647.dat b/domain/blockdag/testdata/277647.dat similarity index 100% rename from blockdag/testdata/277647.dat rename to domain/blockdag/testdata/277647.dat diff --git a/blockdag/testdata/277647.utxostore b/domain/blockdag/testdata/277647.utxostore similarity index 100% rename from blockdag/testdata/277647.utxostore rename to domain/blockdag/testdata/277647.utxostore diff --git a/blockdag/testdata/blk_0_to_4.dat b/domain/blockdag/testdata/blk_0_to_4.dat similarity index 100% rename from blockdag/testdata/blk_0_to_4.dat rename to domain/blockdag/testdata/blk_0_to_4.dat diff --git a/blockdag/testdata/blk_3A.dat b/domain/blockdag/testdata/blk_3A.dat similarity index 100% rename from blockdag/testdata/blk_3A.dat rename to domain/blockdag/testdata/blk_3A.dat diff --git a/blockdag/testdata/blk_3B.dat b/domain/blockdag/testdata/blk_3B.dat similarity index 100% rename from blockdag/testdata/blk_3B.dat rename to domain/blockdag/testdata/blk_3B.dat diff --git a/blockdag/testdata/blk_3C.dat b/domain/blockdag/testdata/blk_3C.dat similarity index 100% rename from blockdag/testdata/blk_3C.dat rename to domain/blockdag/testdata/blk_3C.dat diff --git a/blockdag/testdata/blk_3D.dat b/domain/blockdag/testdata/blk_3D.dat similarity index 100% rename from blockdag/testdata/blk_3D.dat rename to domain/blockdag/testdata/blk_3D.dat diff --git a/blockdag/testdata/reorgtest.hex b/domain/blockdag/testdata/reorgtest.hex similarity index 100% rename from blockdag/testdata/reorgtest.hex rename to domain/blockdag/testdata/reorgtest.hex diff --git a/blockdag/timesorter.go b/domain/blockdag/timesorter.go similarity index 100% rename from blockdag/timesorter.go rename to domain/blockdag/timesorter.go diff --git a/blockdag/timesorter_test.go b/domain/blockdag/timesorter_test.go similarity index 100% rename from blockdag/timesorter_test.go rename to domain/blockdag/timesorter_test.go diff --git a/blockdag/timesource.go b/domain/blockdag/timesource.go similarity index 100% rename from blockdag/timesource.go rename to domain/blockdag/timesource.go diff --git a/blockdag/utxo_ecmh.go b/domain/blockdag/utxo_ecmh.go similarity index 92% rename from blockdag/utxo_ecmh.go rename to domain/blockdag/utxo_ecmh.go index 26794ab8a..e94374a3b 100644 --- a/blockdag/utxo_ecmh.go +++ b/domain/blockdag/utxo_ecmh.go @@ -3,7 +3,7 @@ package blockdag import ( "bytes" "github.com/kaspanet/go-secp256k1" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" ) func addUTXOToMultiset(ms *secp256k1.MultiSet, entry *UTXOEntry, outpoint *domainmessage.Outpoint) (*secp256k1.MultiSet, error) { diff --git a/blockdag/utxodiffstore.go b/domain/blockdag/utxodiffstore.go similarity index 99% rename from blockdag/utxodiffstore.go rename to domain/blockdag/utxodiffstore.go index 04a0e7a72..dd9c5a069 100644 --- a/blockdag/utxodiffstore.go +++ b/domain/blockdag/utxodiffstore.go @@ -3,7 +3,7 @@ package blockdag import ( "bytes" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/locks" ) diff --git a/blockdag/utxodiffstore_test.go b/domain/blockdag/utxodiffstore_test.go similarity index 97% rename from blockdag/utxodiffstore_test.go rename to domain/blockdag/utxodiffstore_test.go index 347939328..07d2cc896 100644 --- a/blockdag/utxodiffstore_test.go +++ b/domain/blockdag/utxodiffstore_test.go @@ -4,9 +4,9 @@ import ( "reflect" "testing" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/dbaccess" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/utxoio.go b/domain/blockdag/utxoio.go similarity index 99% rename from blockdag/utxoio.go rename to domain/blockdag/utxoio.go index 583d075b6..3a848eeb3 100644 --- a/blockdag/utxoio.go +++ b/domain/blockdag/utxoio.go @@ -2,7 +2,7 @@ package blockdag import ( "bytes" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/binaryserializer" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" diff --git a/blockdag/utxoset.go b/domain/blockdag/utxoset.go similarity index 99% rename from blockdag/utxoset.go rename to domain/blockdag/utxoset.go index b96cc7d87..c750929bd 100644 --- a/blockdag/utxoset.go +++ b/domain/blockdag/utxoset.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/kaspanet/go-secp256k1" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" ) const ( diff --git a/blockdag/utxoset_test.go b/domain/blockdag/utxoset_test.go similarity index 99% rename from blockdag/utxoset_test.go rename to domain/blockdag/utxoset_test.go index 30878ddfc..98a2bc360 100644 --- a/blockdag/utxoset_test.go +++ b/domain/blockdag/utxoset_test.go @@ -6,7 +6,7 @@ import ( "github.com/kaspanet/kaspad/util/subnetworkid" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/blockdag/validate.go b/domain/blockdag/validate.go similarity index 99% rename from blockdag/validate.go rename to domain/blockdag/validate.go index 250b12266..d1b3a0dba 100644 --- a/blockdag/validate.go +++ b/domain/blockdag/validate.go @@ -12,9 +12,9 @@ import ( "math" "sort" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/subnetworkid" diff --git a/blockdag/validate_test.go b/domain/blockdag/validate_test.go similarity index 99% rename from blockdag/validate_test.go rename to domain/blockdag/validate_test.go index 6a5ce22c1..9443fd211 100644 --- a/blockdag/validate_test.go +++ b/domain/blockdag/validate_test.go @@ -14,8 +14,8 @@ import ( "github.com/pkg/errors" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/subnetworkid" diff --git a/blockdag/virtualblock.go b/domain/blockdag/virtualblock.go similarity index 100% rename from blockdag/virtualblock.go rename to domain/blockdag/virtualblock.go diff --git a/blockdag/virtualblock_test.go b/domain/blockdag/virtualblock_test.go similarity index 99% rename from blockdag/virtualblock_test.go rename to domain/blockdag/virtualblock_test.go index fbe414b1d..0513177da 100644 --- a/blockdag/virtualblock_test.go +++ b/domain/blockdag/virtualblock_test.go @@ -5,7 +5,7 @@ package blockdag import ( - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util" "reflect" "testing" diff --git a/dagconfig/README.md b/domain/dagconfig/README.md similarity index 95% rename from dagconfig/README.md rename to domain/dagconfig/README.md index 845c10264..54b256729 100644 --- a/dagconfig/README.md +++ b/domain/dagconfig/README.md @@ -19,7 +19,7 @@ import ( "log" "github.com/kaspanet/kaspad/util" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" ) var testnet = flag.Bool("testnet", false, "operate on the testnet Kaspa network") diff --git a/dagconfig/doc.go b/domain/dagconfig/doc.go similarity index 97% rename from dagconfig/doc.go rename to domain/dagconfig/doc.go index 41eb0d23a..e32425fac 100644 --- a/dagconfig/doc.go +++ b/domain/dagconfig/doc.go @@ -28,7 +28,7 @@ variable (either directly, or hidden in a library call). "log" "github.com/kaspanet/kaspad/util" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" ) var testnet = flag.Bool("testnet", false, "operate on the testnet Kaspa network") diff --git a/dagconfig/genesis.go b/domain/dagconfig/genesis.go similarity index 99% rename from dagconfig/genesis.go rename to domain/dagconfig/genesis.go index 4a283637d..23cf7b40d 100644 --- a/dagconfig/genesis.go +++ b/domain/dagconfig/genesis.go @@ -5,7 +5,7 @@ package dagconfig import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/mstime" "github.com/kaspanet/kaspad/util/subnetworkid" diff --git a/dagconfig/genesis_test.go b/domain/dagconfig/genesis_test.go similarity index 100% rename from dagconfig/genesis_test.go rename to domain/dagconfig/genesis_test.go diff --git a/dagconfig/params.go b/domain/dagconfig/params.go similarity index 99% rename from dagconfig/params.go rename to domain/dagconfig/params.go index 0456daed5..250e3fccc 100644 --- a/dagconfig/params.go +++ b/domain/dagconfig/params.go @@ -5,6 +5,7 @@ package dagconfig import ( + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/network" "math/big" "time" @@ -12,8 +13,6 @@ import ( "github.com/pkg/errors" "github.com/kaspanet/kaspad/util" - - "github.com/kaspanet/kaspad/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/dagconfig/params_test.go b/domain/dagconfig/params_test.go similarity index 100% rename from dagconfig/params_test.go rename to domain/dagconfig/params_test.go diff --git a/dagconfig/register_test.go b/domain/dagconfig/register_test.go similarity index 97% rename from dagconfig/register_test.go rename to domain/dagconfig/register_test.go index 2469790a1..5d10ef9b4 100644 --- a/dagconfig/register_test.go +++ b/domain/dagconfig/register_test.go @@ -3,7 +3,7 @@ package dagconfig_test import ( "testing" - . "github.com/kaspanet/kaspad/dagconfig" + . "github.com/kaspanet/kaspad/domain/dagconfig" ) // Define some of the required parameters for a user-registered diff --git a/mempool/README.md b/domain/mempool/README.md similarity index 100% rename from mempool/README.md rename to domain/mempool/README.md diff --git a/mempool/doc.go b/domain/mempool/doc.go similarity index 100% rename from mempool/doc.go rename to domain/mempool/doc.go diff --git a/mempool/error.go b/domain/mempool/error.go similarity index 99% rename from mempool/error.go rename to domain/mempool/error.go index 09b18698b..3dc947846 100644 --- a/mempool/error.go +++ b/domain/mempool/error.go @@ -6,7 +6,7 @@ package mempool import ( "fmt" - "github.com/kaspanet/kaspad/blockdag" + "github.com/kaspanet/kaspad/domain/blockdag" "github.com/pkg/errors" ) diff --git a/mempool/log.go b/domain/mempool/log.go similarity index 81% rename from mempool/log.go rename to domain/mempool/log.go index cb46cf4ab..ce5fd7467 100644 --- a/mempool/log.go +++ b/domain/mempool/log.go @@ -5,7 +5,7 @@ package mempool import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" ) var log, _ = logger.Get(logger.SubsystemTags.TXMP) diff --git a/mempool/mempool.go b/domain/mempool/mempool.go similarity index 99% rename from mempool/mempool.go rename to domain/mempool/mempool.go index 54d0c9c11..3bb3fe0f8 100644 --- a/mempool/mempool.go +++ b/domain/mempool/mempool.go @@ -14,11 +14,11 @@ import ( "github.com/kaspanet/kaspad/util/mstime" "github.com/pkg/errors" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/logger" - "github.com/kaspanet/kaspad/mining" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/mining" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/infrastructure/logger" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/subnetworkid" diff --git a/mempool/mempool_test.go b/domain/mempool/mempool_test.go similarity index 99% rename from mempool/mempool_test.go rename to domain/mempool/mempool_test.go index 9a9d83a91..e6c7baa0d 100644 --- a/mempool/mempool_test.go +++ b/domain/mempool/mempool_test.go @@ -20,11 +20,11 @@ import ( "github.com/kaspanet/kaspad/util/subnetworkid" "github.com/kaspanet/kaspad/util/testtools" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/mining" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/domain/mining" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/mempool/policy.go b/domain/mempool/policy.go similarity index 98% rename from mempool/policy.go rename to domain/mempool/policy.go index 89f312768..d90a31276 100644 --- a/mempool/policy.go +++ b/domain/mempool/policy.go @@ -8,9 +8,9 @@ import ( "fmt" "github.com/kaspanet/kaspad/util/mstime" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" ) diff --git a/mempool/policy_test.go b/domain/mempool/policy_test.go similarity index 98% rename from mempool/policy_test.go rename to domain/mempool/policy_test.go index ca4bc3cc5..6e430d02f 100644 --- a/mempool/policy_test.go +++ b/domain/mempool/policy_test.go @@ -6,8 +6,8 @@ package mempool import ( "bytes" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/mstime" diff --git a/mining/log.go b/domain/mining/log.go similarity index 81% rename from mining/log.go rename to domain/mining/log.go index 570a4b592..0d3c2692e 100644 --- a/mining/log.go +++ b/domain/mining/log.go @@ -5,7 +5,7 @@ package mining import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" ) var log, _ = logger.Get(logger.SubsystemTags.MINR) diff --git a/mining/mining.go b/domain/mining/mining.go similarity index 98% rename from mining/mining.go rename to domain/mining/mining.go index f027bdf21..617dc35e9 100644 --- a/mining/mining.go +++ b/domain/mining/mining.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "time" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/mining/policy.go b/domain/mining/policy.go similarity index 100% rename from mining/policy.go rename to domain/mining/policy.go diff --git a/mining/test_utils.go b/domain/mining/test_utils.go similarity index 96% rename from mining/test_utils.go rename to domain/mining/test_utils.go index bf30369e2..95e1fb674 100644 --- a/mining/test_utils.go +++ b/domain/mining/test_utils.go @@ -6,9 +6,9 @@ import ( "github.com/kaspanet/kaspad/util/mstime" "github.com/pkg/errors" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/mining/txselection.go b/domain/mining/txselection.go similarity index 99% rename from mining/txselection.go rename to domain/mining/txselection.go index 1cb1f98ee..2531c86da 100644 --- a/mining/txselection.go +++ b/domain/mining/txselection.go @@ -5,7 +5,7 @@ import ( "math/rand" "sort" - "github.com/kaspanet/kaspad/blockdag" + "github.com/kaspanet/kaspad/domain/blockdag" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/subnetworkid" ) diff --git a/txscript/README.md b/domain/txscript/README.md similarity index 100% rename from txscript/README.md rename to domain/txscript/README.md diff --git a/txscript/consensus.go b/domain/txscript/consensus.go similarity index 100% rename from txscript/consensus.go rename to domain/txscript/consensus.go diff --git a/txscript/data/LICENSE b/domain/txscript/data/LICENSE similarity index 100% rename from txscript/data/LICENSE rename to domain/txscript/data/LICENSE diff --git a/txscript/data/script_tests.json b/domain/txscript/data/script_tests.json similarity index 100% rename from txscript/data/script_tests.json rename to domain/txscript/data/script_tests.json diff --git a/txscript/data/sighash.json b/domain/txscript/data/sighash.json similarity index 100% rename from txscript/data/sighash.json rename to domain/txscript/data/sighash.json diff --git a/txscript/data/tx_invalid.json b/domain/txscript/data/tx_invalid.json similarity index 100% rename from txscript/data/tx_invalid.json rename to domain/txscript/data/tx_invalid.json diff --git a/txscript/data/tx_valid.json b/domain/txscript/data/tx_valid.json similarity index 100% rename from txscript/data/tx_valid.json rename to domain/txscript/data/tx_valid.json diff --git a/txscript/doc.go b/domain/txscript/doc.go similarity index 100% rename from txscript/doc.go rename to domain/txscript/doc.go diff --git a/txscript/engine.go b/domain/txscript/engine.go similarity index 99% rename from txscript/engine.go rename to domain/txscript/engine.go index e8ed42c44..db84e23ca 100644 --- a/txscript/engine.go +++ b/domain/txscript/engine.go @@ -6,8 +6,8 @@ package txscript import ( "fmt" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" + "github.com/kaspanet/kaspad/network/domainmessage" ) // ScriptFlags is a bitmask defining additional operations or tests that will be diff --git a/txscript/engine_test.go b/domain/txscript/engine_test.go similarity index 99% rename from txscript/engine_test.go rename to domain/txscript/engine_test.go index b6a59582c..d3279f553 100644 --- a/txscript/engine_test.go +++ b/domain/txscript/engine_test.go @@ -7,7 +7,7 @@ package txscript import ( "testing" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/txscript/error.go b/domain/txscript/error.go similarity index 100% rename from txscript/error.go rename to domain/txscript/error.go diff --git a/txscript/error_test.go b/domain/txscript/error_test.go similarity index 100% rename from txscript/error_test.go rename to domain/txscript/error_test.go diff --git a/txscript/example_test.go b/domain/txscript/example_test.go similarity index 95% rename from txscript/example_test.go rename to domain/txscript/example_test.go index db75d1574..a9c884793 100644 --- a/txscript/example_test.go +++ b/domain/txscript/example_test.go @@ -8,8 +8,8 @@ import ( "encoding/hex" "fmt" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/domain/txscript" "github.com/kaspanet/kaspad/util" ) diff --git a/txscript/log.go b/domain/txscript/log.go similarity index 81% rename from txscript/log.go rename to domain/txscript/log.go index 4ddc666fc..54d5a46e8 100644 --- a/txscript/log.go +++ b/domain/txscript/log.go @@ -5,7 +5,7 @@ package txscript import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" ) var log, _ = logger.Get(logger.SubsystemTags.SCRP) diff --git a/txscript/main_test.go b/domain/txscript/main_test.go similarity index 80% rename from txscript/main_test.go rename to domain/txscript/main_test.go index 4d0ada298..674e9d2b4 100644 --- a/txscript/main_test.go +++ b/domain/txscript/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/kaspanet/kaspad/logs" + "github.com/kaspanet/kaspad/infrastructure/logs" ) func TestMain(m *testing.M) { diff --git a/txscript/opcode.go b/domain/txscript/opcode.go similarity index 99% rename from txscript/opcode.go rename to domain/txscript/opcode.go index d55efb09f..1d3064f74 100644 --- a/txscript/opcode.go +++ b/domain/txscript/opcode.go @@ -15,7 +15,7 @@ import ( "golang.org/x/crypto/ripemd160" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/txscript/opcode_test.go b/domain/txscript/opcode_test.go similarity index 100% rename from txscript/opcode_test.go rename to domain/txscript/opcode_test.go diff --git a/txscript/reference_test.go b/domain/txscript/reference_test.go similarity index 99% rename from txscript/reference_test.go rename to domain/txscript/reference_test.go index 1ebf00dda..85f701a60 100644 --- a/txscript/reference_test.go +++ b/domain/txscript/reference_test.go @@ -8,14 +8,14 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/kaspanet/kaspad/logs" + "github.com/kaspanet/kaspad/infrastructure/logs" "github.com/pkg/errors" "io/ioutil" "strconv" "strings" "testing" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/txscript/script.go b/domain/txscript/script.go similarity index 99% rename from txscript/script.go rename to domain/txscript/script.go index 65426662f..01647f7cc 100644 --- a/txscript/script.go +++ b/domain/txscript/script.go @@ -10,7 +10,7 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/txscript/script_test.go b/domain/txscript/script_test.go similarity index 100% rename from txscript/script_test.go rename to domain/txscript/script_test.go diff --git a/txscript/scriptbuilder.go b/domain/txscript/scriptbuilder.go similarity index 100% rename from txscript/scriptbuilder.go rename to domain/txscript/scriptbuilder.go diff --git a/txscript/scriptbuilder_test.go b/domain/txscript/scriptbuilder_test.go similarity index 100% rename from txscript/scriptbuilder_test.go rename to domain/txscript/scriptbuilder_test.go diff --git a/txscript/scriptnum.go b/domain/txscript/scriptnum.go similarity index 100% rename from txscript/scriptnum.go rename to domain/txscript/scriptnum.go diff --git a/txscript/scriptnum_test.go b/domain/txscript/scriptnum_test.go similarity index 100% rename from txscript/scriptnum_test.go rename to domain/txscript/scriptnum_test.go diff --git a/txscript/sigcache.go b/domain/txscript/sigcache.go similarity index 100% rename from txscript/sigcache.go rename to domain/txscript/sigcache.go diff --git a/txscript/sigcache_test.go b/domain/txscript/sigcache_test.go similarity index 100% rename from txscript/sigcache_test.go rename to domain/txscript/sigcache_test.go diff --git a/txscript/sign.go b/domain/txscript/sign.go similarity index 98% rename from txscript/sign.go rename to domain/txscript/sign.go index f5e451f10..11750cc97 100644 --- a/txscript/sign.go +++ b/domain/txscript/sign.go @@ -8,8 +8,8 @@ import ( "github.com/kaspanet/go-secp256k1" "github.com/pkg/errors" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" ) diff --git a/txscript/sign_test.go b/domain/txscript/sign_test.go similarity index 99% rename from txscript/sign_test.go rename to domain/txscript/sign_test.go index b9f3e058e..abc913181 100644 --- a/txscript/sign_test.go +++ b/domain/txscript/sign_test.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" "testing" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/txscript/stack.go b/domain/txscript/stack.go similarity index 100% rename from txscript/stack.go rename to domain/txscript/stack.go diff --git a/txscript/stack_test.go b/domain/txscript/stack_test.go similarity index 100% rename from txscript/stack_test.go rename to domain/txscript/stack_test.go diff --git a/txscript/standard.go b/domain/txscript/standard.go similarity index 99% rename from txscript/standard.go rename to domain/txscript/standard.go index 55723bd8d..00b2f4f47 100644 --- a/txscript/standard.go +++ b/domain/txscript/standard.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util" ) diff --git a/txscript/standard_test.go b/domain/txscript/standard_test.go similarity index 99% rename from txscript/standard_test.go rename to domain/txscript/standard_test.go index 4ca79fb8d..8e19a3e91 100644 --- a/txscript/standard_test.go +++ b/domain/txscript/standard_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util" ) diff --git a/config/config.go b/infrastructure/config/config.go similarity index 99% rename from config/config.go rename to infrastructure/config/config.go index 74e7ee027..ceb83b43a 100644 --- a/config/config.go +++ b/infrastructure/config/config.go @@ -18,17 +18,17 @@ import ( "strings" "time" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/pkg/errors" "github.com/btcsuite/go-socks/socks" "github.com/jessevdk/go-flags" - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" + "github.com/kaspanet/kaspad/infrastructure/version" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/network" "github.com/kaspanet/kaspad/util/subnetworkid" - "github.com/kaspanet/kaspad/version" ) const ( diff --git a/config/config_test.go b/infrastructure/config/config_test.go similarity index 96% rename from config/config_test.go rename to infrastructure/config/config_test.go index bac74e8f7..3830033d3 100644 --- a/config/config_test.go +++ b/infrastructure/config/config_test.go @@ -22,7 +22,7 @@ func TestCreateDefaultConfigFile(t *testing.T) { if !ok { t.Fatalf("Failed finding config file path") } - sampleConfigFile := filepath.Join(filepath.Dir(path), "..", "sample-kaspad.conf") + sampleConfigFile := filepath.Join(filepath.Dir(path), "..", "..", "sample-kaspad.conf") // Setup a temporary directory tmpDir, err := ioutil.TempDir("", "kaspad") diff --git a/config/log.go b/infrastructure/config/log.go similarity index 81% rename from config/log.go rename to infrastructure/config/log.go index 97402b5d9..c55c9ed17 100644 --- a/config/log.go +++ b/infrastructure/config/log.go @@ -5,7 +5,7 @@ package config import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" ) var log, _ = logger.Get(logger.SubsystemTags.CNFG) diff --git a/config/network.go b/infrastructure/config/network.go similarity index 97% rename from config/network.go rename to infrastructure/config/network.go index ad9584bbd..db5d6caf6 100644 --- a/config/network.go +++ b/infrastructure/config/network.go @@ -3,7 +3,7 @@ package config import ( "fmt" "github.com/jessevdk/go-flags" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/pkg/errors" "os" ) diff --git a/database/README.md b/infrastructure/database/README.md similarity index 100% rename from database/README.md rename to infrastructure/database/README.md diff --git a/database/common_test.go b/infrastructure/database/common_test.go similarity index 95% rename from database/common_test.go rename to infrastructure/database/common_test.go index 9890dd5bc..5b9bb781d 100644 --- a/database/common_test.go +++ b/infrastructure/database/common_test.go @@ -2,8 +2,8 @@ package database_test import ( "fmt" - "github.com/kaspanet/kaspad/database" - "github.com/kaspanet/kaspad/database/ffldb" + "github.com/kaspanet/kaspad/infrastructure/database" + "github.com/kaspanet/kaspad/infrastructure/database/ffldb" "io/ioutil" "testing" ) diff --git a/database/cursor.go b/infrastructure/database/cursor.go similarity index 100% rename from database/cursor.go rename to infrastructure/database/cursor.go diff --git a/database/cursor_test.go b/infrastructure/database/cursor_test.go similarity index 99% rename from database/cursor_test.go rename to infrastructure/database/cursor_test.go index c89c6fe4f..893888fa4 100644 --- a/database/cursor_test.go +++ b/infrastructure/database/cursor_test.go @@ -8,7 +8,7 @@ package database_test import ( "bytes" "fmt" - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "reflect" "strings" "testing" diff --git a/database/dataaccessor.go b/infrastructure/database/dataaccessor.go similarity index 100% rename from database/dataaccessor.go rename to infrastructure/database/dataaccessor.go diff --git a/database/database.go b/infrastructure/database/database.go similarity index 100% rename from database/database.go rename to infrastructure/database/database.go diff --git a/database/database_test.go b/infrastructure/database/database_test.go similarity index 99% rename from database/database_test.go rename to infrastructure/database/database_test.go index 310db42b0..507c98fcd 100644 --- a/database/database_test.go +++ b/infrastructure/database/database_test.go @@ -7,7 +7,7 @@ package database_test import ( "bytes" - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "testing" ) diff --git a/database/doc.go b/infrastructure/database/doc.go similarity index 100% rename from database/doc.go rename to infrastructure/database/doc.go diff --git a/database/errors.go b/infrastructure/database/errors.go similarity index 100% rename from database/errors.go rename to infrastructure/database/errors.go diff --git a/database/ffldb/ff/flatfile.go b/infrastructure/database/ffldb/ff/flatfile.go similarity index 100% rename from database/ffldb/ff/flatfile.go rename to infrastructure/database/ffldb/ff/flatfile.go diff --git a/database/ffldb/ff/flatfile_test.go b/infrastructure/database/ffldb/ff/flatfile_test.go similarity index 98% rename from database/ffldb/ff/flatfile_test.go rename to infrastructure/database/ffldb/ff/flatfile_test.go index eadf8be8a..53b7d7dfd 100644 --- a/database/ffldb/ff/flatfile_test.go +++ b/infrastructure/database/ffldb/ff/flatfile_test.go @@ -2,7 +2,7 @@ package ff import ( "bytes" - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "io/ioutil" "os" "reflect" diff --git a/database/ffldb/ff/flatfiledb.go b/infrastructure/database/ffldb/ff/flatfiledb.go similarity index 100% rename from database/ffldb/ff/flatfiledb.go rename to infrastructure/database/ffldb/ff/flatfiledb.go diff --git a/database/ffldb/ff/location.go b/infrastructure/database/ffldb/ff/location.go similarity index 100% rename from database/ffldb/ff/location.go rename to infrastructure/database/ffldb/ff/location.go diff --git a/database/ffldb/ff/location_test.go b/infrastructure/database/ffldb/ff/location_test.go similarity index 100% rename from database/ffldb/ff/location_test.go rename to infrastructure/database/ffldb/ff/location_test.go diff --git a/database/ffldb/ff/lockablefile.go b/infrastructure/database/ffldb/ff/lockablefile.go similarity index 100% rename from database/ffldb/ff/lockablefile.go rename to infrastructure/database/ffldb/ff/lockablefile.go diff --git a/database/ffldb/ff/log.go b/infrastructure/database/ffldb/ff/log.go similarity index 52% rename from database/ffldb/ff/log.go rename to infrastructure/database/ffldb/ff/log.go index 812e124ad..15a1eecd0 100644 --- a/database/ffldb/ff/log.go +++ b/infrastructure/database/ffldb/ff/log.go @@ -1,5 +1,5 @@ package ff -import "github.com/kaspanet/kaspad/logger" +import "github.com/kaspanet/kaspad/infrastructure/logger" var log, _ = logger.Get(logger.SubsystemTags.KSDB) diff --git a/database/ffldb/ff/read.go b/infrastructure/database/ffldb/ff/read.go similarity index 99% rename from database/ffldb/ff/read.go rename to infrastructure/database/ffldb/ff/read.go index e8ce811e9..e3807f159 100644 --- a/database/ffldb/ff/read.go +++ b/infrastructure/database/ffldb/ff/read.go @@ -1,7 +1,7 @@ package ff import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "github.com/pkg/errors" "hash/crc32" "os" diff --git a/database/ffldb/ff/rollback.go b/infrastructure/database/ffldb/ff/rollback.go similarity index 100% rename from database/ffldb/ff/rollback.go rename to infrastructure/database/ffldb/ff/rollback.go diff --git a/database/ffldb/ff/write.go b/infrastructure/database/ffldb/ff/write.go similarity index 100% rename from database/ffldb/ff/write.go rename to infrastructure/database/ffldb/ff/write.go diff --git a/database/ffldb/ffldb.go b/infrastructure/database/ffldb/ffldb.go similarity index 96% rename from database/ffldb/ffldb.go rename to infrastructure/database/ffldb/ffldb.go index 7e1c183ca..7b7d2be8a 100644 --- a/database/ffldb/ffldb.go +++ b/infrastructure/database/ffldb/ffldb.go @@ -1,9 +1,9 @@ package ffldb import ( - "github.com/kaspanet/kaspad/database" - "github.com/kaspanet/kaspad/database/ffldb/ff" - "github.com/kaspanet/kaspad/database/ffldb/ldb" + "github.com/kaspanet/kaspad/infrastructure/database" + "github.com/kaspanet/kaspad/infrastructure/database/ffldb/ff" + "github.com/kaspanet/kaspad/infrastructure/database/ffldb/ldb" "github.com/pkg/errors" ) diff --git a/database/ffldb/ffldb_test.go b/infrastructure/database/ffldb/ffldb_test.go similarity index 98% rename from database/ffldb/ffldb_test.go rename to infrastructure/database/ffldb/ffldb_test.go index a97d27a68..393e7bfc7 100644 --- a/database/ffldb/ffldb_test.go +++ b/infrastructure/database/ffldb/ffldb_test.go @@ -1,7 +1,7 @@ package ffldb import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "io/ioutil" "reflect" "testing" diff --git a/database/ffldb/initialize.go b/infrastructure/database/ffldb/initialize.go similarity index 100% rename from database/ffldb/initialize.go rename to infrastructure/database/ffldb/initialize.go diff --git a/database/ffldb/ldb/cursor.go b/infrastructure/database/ffldb/ldb/cursor.go similarity index 98% rename from database/ffldb/ldb/cursor.go rename to infrastructure/database/ffldb/ldb/cursor.go index ebc020bba..54f3feb0b 100644 --- a/database/ffldb/ldb/cursor.go +++ b/infrastructure/database/ffldb/ldb/cursor.go @@ -3,7 +3,7 @@ package ldb import ( "bytes" - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "github.com/pkg/errors" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/util" diff --git a/database/ffldb/ldb/cursor_test.go b/infrastructure/database/ffldb/ldb/cursor_test.go similarity index 99% rename from database/ffldb/ldb/cursor_test.go rename to infrastructure/database/ffldb/ldb/cursor_test.go index 71d580c8c..4187abbae 100644 --- a/database/ffldb/ldb/cursor_test.go +++ b/infrastructure/database/ffldb/ldb/cursor_test.go @@ -3,7 +3,7 @@ package ldb import ( "bytes" "fmt" - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "reflect" "strings" "testing" diff --git a/database/ffldb/ldb/leveldb.go b/infrastructure/database/ffldb/ldb/leveldb.go similarity index 97% rename from database/ffldb/ldb/leveldb.go rename to infrastructure/database/ffldb/ldb/leveldb.go index 27fab5600..b82a981b6 100644 --- a/database/ffldb/ldb/leveldb.go +++ b/infrastructure/database/ffldb/ldb/leveldb.go @@ -1,7 +1,7 @@ package ldb import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "github.com/pkg/errors" "github.com/syndtr/goleveldb/leveldb" ldbErrors "github.com/syndtr/goleveldb/leveldb/errors" diff --git a/database/ffldb/ldb/leveldb_test.go b/infrastructure/database/ffldb/ldb/leveldb_test.go similarity index 98% rename from database/ffldb/ldb/leveldb_test.go rename to infrastructure/database/ffldb/ldb/leveldb_test.go index efa00e186..5d9e46af0 100644 --- a/database/ffldb/ldb/leveldb_test.go +++ b/infrastructure/database/ffldb/ldb/leveldb_test.go @@ -1,7 +1,7 @@ package ldb import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "io/ioutil" "reflect" "testing" diff --git a/database/ffldb/ldb/log.go b/infrastructure/database/ffldb/ldb/log.go similarity index 52% rename from database/ffldb/ldb/log.go rename to infrastructure/database/ffldb/ldb/log.go index 8ec45e189..d461732cf 100644 --- a/database/ffldb/ldb/log.go +++ b/infrastructure/database/ffldb/ldb/log.go @@ -1,5 +1,5 @@ package ldb -import "github.com/kaspanet/kaspad/logger" +import "github.com/kaspanet/kaspad/infrastructure/logger" var log, _ = logger.Get(logger.SubsystemTags.KSDB) diff --git a/database/ffldb/ldb/options.go b/infrastructure/database/ffldb/ldb/options.go similarity index 100% rename from database/ffldb/ldb/options.go rename to infrastructure/database/ffldb/ldb/options.go diff --git a/database/ffldb/ldb/transaction.go b/infrastructure/database/ffldb/ldb/transaction.go similarity index 98% rename from database/ffldb/ldb/transaction.go rename to infrastructure/database/ffldb/ldb/transaction.go index 4c3e974b0..6106b1fa6 100644 --- a/database/ffldb/ldb/transaction.go +++ b/infrastructure/database/ffldb/ldb/transaction.go @@ -1,7 +1,7 @@ package ldb import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "github.com/pkg/errors" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/database/ffldb/ldb/transaction_test.go b/infrastructure/database/ffldb/ldb/transaction_test.go similarity index 98% rename from database/ffldb/ldb/transaction_test.go rename to infrastructure/database/ffldb/ldb/transaction_test.go index c7dc8416b..804bcd98c 100644 --- a/database/ffldb/ldb/transaction_test.go +++ b/infrastructure/database/ffldb/ldb/transaction_test.go @@ -1,7 +1,7 @@ package ldb import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "strings" "testing" ) diff --git a/database/ffldb/log.go b/infrastructure/database/ffldb/log.go similarity index 53% rename from database/ffldb/log.go rename to infrastructure/database/ffldb/log.go index 76db8d5dd..9721d39bd 100644 --- a/database/ffldb/log.go +++ b/infrastructure/database/ffldb/log.go @@ -1,5 +1,5 @@ package ffldb -import "github.com/kaspanet/kaspad/logger" +import "github.com/kaspanet/kaspad/infrastructure/logger" var log, _ = logger.Get(logger.SubsystemTags.KSDB) diff --git a/database/ffldb/transaction.go b/infrastructure/database/ffldb/transaction.go similarity index 95% rename from database/ffldb/transaction.go rename to infrastructure/database/ffldb/transaction.go index c7652c0ca..d4e2bf105 100644 --- a/database/ffldb/transaction.go +++ b/infrastructure/database/ffldb/transaction.go @@ -1,9 +1,9 @@ package ffldb import ( - "github.com/kaspanet/kaspad/database" - "github.com/kaspanet/kaspad/database/ffldb/ff" - "github.com/kaspanet/kaspad/database/ffldb/ldb" + "github.com/kaspanet/kaspad/infrastructure/database" + "github.com/kaspanet/kaspad/infrastructure/database/ffldb/ff" + "github.com/kaspanet/kaspad/infrastructure/database/ffldb/ldb" "github.com/pkg/errors" ) diff --git a/database/ffldb/transaction_test.go b/infrastructure/database/ffldb/transaction_test.go similarity index 99% rename from database/ffldb/transaction_test.go rename to infrastructure/database/ffldb/transaction_test.go index c76844858..1547b302b 100644 --- a/database/ffldb/transaction_test.go +++ b/infrastructure/database/ffldb/transaction_test.go @@ -2,7 +2,7 @@ package ffldb import ( "bytes" - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "strings" "testing" ) diff --git a/database/keys.go b/infrastructure/database/keys.go similarity index 100% rename from database/keys.go rename to infrastructure/database/keys.go diff --git a/database/keys_test.go b/infrastructure/database/keys_test.go similarity index 100% rename from database/keys_test.go rename to infrastructure/database/keys_test.go diff --git a/database/transaction.go b/infrastructure/database/transaction.go similarity index 100% rename from database/transaction.go rename to infrastructure/database/transaction.go diff --git a/database/transaction_test.go b/infrastructure/database/transaction_test.go similarity index 99% rename from database/transaction_test.go rename to infrastructure/database/transaction_test.go index c49f49614..e4c21574b 100644 --- a/database/transaction_test.go +++ b/infrastructure/database/transaction_test.go @@ -7,7 +7,7 @@ package database_test import ( "bytes" - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "strings" "testing" ) diff --git a/dbaccess/acceptanceindex.go b/infrastructure/dbaccess/acceptanceindex.go similarity index 96% rename from dbaccess/acceptanceindex.go rename to infrastructure/dbaccess/acceptanceindex.go index a5dee53c3..e2e13b463 100644 --- a/dbaccess/acceptanceindex.go +++ b/infrastructure/dbaccess/acceptanceindex.go @@ -1,7 +1,7 @@ package dbaccess import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" ) diff --git a/dbaccess/block.go b/infrastructure/dbaccess/block.go similarity index 97% rename from dbaccess/block.go rename to infrastructure/dbaccess/block.go index 04b38f4ef..062ff53aa 100644 --- a/dbaccess/block.go +++ b/infrastructure/dbaccess/block.go @@ -1,7 +1,7 @@ package dbaccess import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" ) diff --git a/dbaccess/block_test.go b/infrastructure/dbaccess/block_test.go similarity index 97% rename from dbaccess/block_test.go rename to infrastructure/dbaccess/block_test.go index 4ee02a5bb..b2d551f0b 100644 --- a/dbaccess/block_test.go +++ b/infrastructure/dbaccess/block_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/kaspanet/kaspad/util" ) diff --git a/dbaccess/blockindex.go b/infrastructure/dbaccess/blockindex.go similarity index 96% rename from dbaccess/blockindex.go rename to infrastructure/dbaccess/blockindex.go index e32c1de47..e359b46b9 100644 --- a/dbaccess/blockindex.go +++ b/infrastructure/dbaccess/blockindex.go @@ -2,7 +2,7 @@ package dbaccess import ( "encoding/hex" - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "github.com/pkg/errors" ) diff --git a/dbaccess/common.go b/infrastructure/dbaccess/common.go similarity index 91% rename from dbaccess/common.go rename to infrastructure/dbaccess/common.go index 25c0027dd..5f19100d5 100644 --- a/dbaccess/common.go +++ b/infrastructure/dbaccess/common.go @@ -1,6 +1,6 @@ package dbaccess -import "github.com/kaspanet/kaspad/database" +import "github.com/kaspanet/kaspad/infrastructure/database" func clearBucket(dbTx *TxContext, bucket *database.Bucket) error { accessor, err := dbTx.accessor() diff --git a/dbaccess/context.go b/infrastructure/dbaccess/context.go similarity index 96% rename from dbaccess/context.go rename to infrastructure/dbaccess/context.go index 16a20ad6a..6fb50a8e2 100644 --- a/dbaccess/context.go +++ b/infrastructure/dbaccess/context.go @@ -1,7 +1,7 @@ package dbaccess import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" ) // Context is an interface type representing the context in which queries run, currently relating to the diff --git a/dbaccess/dagstate.go b/infrastructure/dbaccess/dagstate.go similarity index 91% rename from dbaccess/dagstate.go rename to infrastructure/dbaccess/dagstate.go index 932a9848e..225e67b36 100644 --- a/dbaccess/dagstate.go +++ b/infrastructure/dbaccess/dagstate.go @@ -1,6 +1,6 @@ package dbaccess -import "github.com/kaspanet/kaspad/database" +import "github.com/kaspanet/kaspad/infrastructure/database" var ( dagStateKey = database.MakeBucket().Key([]byte("dag-state")) diff --git a/dbaccess/db.go b/infrastructure/dbaccess/db.go similarity index 85% rename from dbaccess/db.go rename to infrastructure/dbaccess/db.go index 6b00ace2a..40ece1e96 100644 --- a/dbaccess/db.go +++ b/infrastructure/dbaccess/db.go @@ -1,8 +1,8 @@ package dbaccess import ( - "github.com/kaspanet/kaspad/database" - "github.com/kaspanet/kaspad/database/ffldb" + "github.com/kaspanet/kaspad/infrastructure/database" + "github.com/kaspanet/kaspad/infrastructure/database/ffldb" ) // DatabaseContext represents a context in which all database queries run diff --git a/dbaccess/errors.go b/infrastructure/dbaccess/errors.go similarity index 72% rename from dbaccess/errors.go rename to infrastructure/dbaccess/errors.go index 82f2fc33b..2df0a16be 100644 --- a/dbaccess/errors.go +++ b/infrastructure/dbaccess/errors.go @@ -1,6 +1,6 @@ package dbaccess -import "github.com/kaspanet/kaspad/database" +import "github.com/kaspanet/kaspad/infrastructure/database" // IsNotFoundError checks whether an error is an ErrNotFound. func IsNotFoundError(err error) bool { diff --git a/dbaccess/fee_data.go b/infrastructure/dbaccess/fee_data.go similarity index 94% rename from dbaccess/fee_data.go rename to infrastructure/dbaccess/fee_data.go index 7fe854ef3..c08007594 100644 --- a/dbaccess/fee_data.go +++ b/infrastructure/dbaccess/fee_data.go @@ -1,7 +1,7 @@ package dbaccess import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" ) diff --git a/dbaccess/multiset.go b/infrastructure/dbaccess/multiset.go similarity index 95% rename from dbaccess/multiset.go rename to infrastructure/dbaccess/multiset.go index f26446a80..eb40e4a04 100644 --- a/dbaccess/multiset.go +++ b/infrastructure/dbaccess/multiset.go @@ -1,7 +1,7 @@ package dbaccess import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/dbaccess/peers.go b/infrastructure/dbaccess/peers.go similarity index 91% rename from dbaccess/peers.go rename to infrastructure/dbaccess/peers.go index f7104c1bf..1ab50ab70 100644 --- a/dbaccess/peers.go +++ b/infrastructure/dbaccess/peers.go @@ -1,6 +1,6 @@ package dbaccess -import "github.com/kaspanet/kaspad/database" +import "github.com/kaspanet/kaspad/infrastructure/database" var ( peersKey = database.MakeBucket().Key([]byte("peers")) diff --git a/dbaccess/reachability.go b/infrastructure/dbaccess/reachability.go similarity index 97% rename from dbaccess/reachability.go rename to infrastructure/dbaccess/reachability.go index dada75cfc..d041bb831 100644 --- a/dbaccess/reachability.go +++ b/infrastructure/dbaccess/reachability.go @@ -1,7 +1,7 @@ package dbaccess import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/dbaccess/subnetwork.go b/infrastructure/dbaccess/subnetwork.go similarity index 95% rename from dbaccess/subnetwork.go rename to infrastructure/dbaccess/subnetwork.go index 6b6c739df..be8cd0327 100644 --- a/dbaccess/subnetwork.go +++ b/infrastructure/dbaccess/subnetwork.go @@ -1,7 +1,7 @@ package dbaccess import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "github.com/kaspanet/kaspad/util/subnetworkid" ) diff --git a/dbaccess/utxo.go b/infrastructure/dbaccess/utxo.go similarity index 95% rename from dbaccess/utxo.go rename to infrastructure/dbaccess/utxo.go index 555b79dbb..4c4488c88 100644 --- a/dbaccess/utxo.go +++ b/infrastructure/dbaccess/utxo.go @@ -1,7 +1,7 @@ package dbaccess import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" ) var ( diff --git a/dbaccess/utxodiff.go b/infrastructure/dbaccess/utxodiff.go similarity index 95% rename from dbaccess/utxodiff.go rename to infrastructure/dbaccess/utxodiff.go index be4f64c86..cffb8dcdc 100644 --- a/dbaccess/utxodiff.go +++ b/infrastructure/dbaccess/utxodiff.go @@ -1,7 +1,7 @@ package dbaccess import ( - "github.com/kaspanet/kaspad/database" + "github.com/kaspanet/kaspad/infrastructure/database" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" ) diff --git a/limits/limits_plan9.go b/infrastructure/limits/limits_plan9.go similarity index 100% rename from limits/limits_plan9.go rename to infrastructure/limits/limits_plan9.go diff --git a/limits/limits_unix.go b/infrastructure/limits/limits_unix.go similarity index 100% rename from limits/limits_unix.go rename to infrastructure/limits/limits_unix.go diff --git a/limits/limits_windows.go b/infrastructure/limits/limits_windows.go similarity index 100% rename from limits/limits_windows.go rename to infrastructure/limits/limits_windows.go diff --git a/logger/logger.go b/infrastructure/logger/logger.go similarity index 99% rename from logger/logger.go rename to infrastructure/logger/logger.go index 055dc417d..b01a94ff8 100644 --- a/logger/logger.go +++ b/infrastructure/logger/logger.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "github.com/kaspanet/kaspad/logs" + "github.com/kaspanet/kaspad/infrastructure/logs" ) // Loggers per subsystem. A single backend logger is created and all subsytem diff --git a/logs/doc.go b/infrastructure/logs/doc.go similarity index 100% rename from logs/doc.go rename to infrastructure/logs/doc.go diff --git a/logs/logs.go b/infrastructure/logs/logs.go similarity index 100% rename from logs/logs.go rename to infrastructure/logs/logs.go diff --git a/signal/log.go b/infrastructure/signal/log.go similarity index 81% rename from signal/log.go rename to infrastructure/signal/log.go index 310381e4e..09e217f19 100644 --- a/signal/log.go +++ b/infrastructure/signal/log.go @@ -5,7 +5,7 @@ package signal import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" ) var kasdLog, _ = logger.Get(logger.SubsystemTags.KASD) diff --git a/signal/signal.go b/infrastructure/signal/signal.go similarity index 100% rename from signal/signal.go rename to infrastructure/signal/signal.go diff --git a/signal/signalsigterm.go b/infrastructure/signal/signalsigterm.go similarity index 100% rename from signal/signalsigterm.go rename to infrastructure/signal/signalsigterm.go diff --git a/version/version.go b/infrastructure/version/version.go similarity index 100% rename from version/version.go rename to infrastructure/version/version.go diff --git a/log.go b/log.go index 7cdf58c98..6c7cd34ab 100644 --- a/log.go +++ b/log.go @@ -6,7 +6,7 @@ package main import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/main.go b/main.go index c078ae8c0..6ee82900d 100644 --- a/main.go +++ b/main.go @@ -15,15 +15,15 @@ import ( "github.com/kaspanet/kaspad/app" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" - "github.com/kaspanet/kaspad/blockdag/indexers" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/limits" - "github.com/kaspanet/kaspad/signal" + "github.com/kaspanet/kaspad/domain/blockdag/indexers" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/infrastructure/limits" + "github.com/kaspanet/kaspad/infrastructure/signal" + "github.com/kaspanet/kaspad/infrastructure/version" "github.com/kaspanet/kaspad/util/panics" "github.com/kaspanet/kaspad/util/profiling" - "github.com/kaspanet/kaspad/version" ) const ( diff --git a/addressmanager/addressmanager.go b/network/addressmanager/addressmanager.go similarity index 99% rename from addressmanager/addressmanager.go rename to network/addressmanager/addressmanager.go index ec93dd7ee..7cea6e058 100644 --- a/addressmanager/addressmanager.go +++ b/network/addressmanager/addressmanager.go @@ -9,8 +9,9 @@ import ( crand "crypto/rand" // for seeding "encoding/binary" "encoding/gob" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/mstime" "github.com/pkg/errors" "io" @@ -23,7 +24,6 @@ import ( "github.com/kaspanet/kaspad/util/subnetworkid" - "github.com/kaspanet/kaspad/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/addressmanager/addressmanager_test.go b/network/addressmanager/addressmanager_test.go similarity index 99% rename from addressmanager/addressmanager_test.go rename to network/addressmanager/addressmanager_test.go index fec92c909..59cd3f1ed 100644 --- a/addressmanager/addressmanager_test.go +++ b/network/addressmanager/addressmanager_test.go @@ -6,20 +6,19 @@ package addressmanager import ( "fmt" + "github.com/kaspanet/kaspad/network/domainmessage" "io/ioutil" "net" "reflect" "testing" "time" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" "github.com/kaspanet/kaspad/util/mstime" "github.com/kaspanet/kaspad/util/subnetworkid" "github.com/pkg/errors" - - "github.com/kaspanet/kaspad/domainmessage" ) // naTest is used to describe a test to be performed against the NetAddressKey diff --git a/addressmanager/doc.go b/network/addressmanager/doc.go similarity index 100% rename from addressmanager/doc.go rename to network/addressmanager/doc.go diff --git a/addressmanager/internal_test.go b/network/addressmanager/internal_test.go similarity index 92% rename from addressmanager/internal_test.go rename to network/addressmanager/internal_test.go index 9d3c32401..29e304959 100644 --- a/addressmanager/internal_test.go +++ b/network/addressmanager/internal_test.go @@ -5,7 +5,7 @@ package addressmanager import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/mstime" ) diff --git a/addressmanager/knownaddress.go b/network/addressmanager/knownaddress.go similarity index 98% rename from addressmanager/knownaddress.go rename to network/addressmanager/knownaddress.go index ba01f3d0f..6ca6c6690 100644 --- a/addressmanager/knownaddress.go +++ b/network/addressmanager/knownaddress.go @@ -5,12 +5,11 @@ package addressmanager import ( + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/mstime" "time" "github.com/kaspanet/kaspad/util/subnetworkid" - - "github.com/kaspanet/kaspad/domainmessage" ) // KnownAddress tracks information about a known network address that is used diff --git a/addressmanager/knownaddress_test.go b/network/addressmanager/knownaddress_test.go similarity index 97% rename from addressmanager/knownaddress_test.go rename to network/addressmanager/knownaddress_test.go index c5f698eb0..bf2a6096d 100644 --- a/addressmanager/knownaddress_test.go +++ b/network/addressmanager/knownaddress_test.go @@ -5,13 +5,13 @@ package addressmanager_test import ( + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/mstime" "math" "testing" "time" - "github.com/kaspanet/kaspad/addressmanager" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/addressmanager" ) func TestChance(t *testing.T) { diff --git a/addressmanager/log.go b/network/addressmanager/log.go similarity index 86% rename from addressmanager/log.go rename to network/addressmanager/log.go index b7c926b19..c18eda5c7 100644 --- a/addressmanager/log.go +++ b/network/addressmanager/log.go @@ -5,7 +5,7 @@ package addressmanager import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/addressmanager/network.go b/network/addressmanager/network.go similarity index 99% rename from addressmanager/network.go rename to network/addressmanager/network.go index 294e252f9..918a096bb 100644 --- a/addressmanager/network.go +++ b/network/addressmanager/network.go @@ -5,9 +5,8 @@ package addressmanager import ( + "github.com/kaspanet/kaspad/network/domainmessage" "net" - - "github.com/kaspanet/kaspad/domainmessage" ) var ( diff --git a/addressmanager/network_test.go b/network/addressmanager/network_test.go similarity index 99% rename from addressmanager/network_test.go rename to network/addressmanager/network_test.go index 04efa3a24..059b3baa0 100644 --- a/addressmanager/network_test.go +++ b/network/addressmanager/network_test.go @@ -5,10 +5,9 @@ package addressmanager import ( + "github.com/kaspanet/kaspad/network/domainmessage" "net" "testing" - - "github.com/kaspanet/kaspad/domainmessage" ) // TestIPTypes ensures the various functions which determine the type of an IP diff --git a/connmanager/connection_requests.go b/network/connmanager/connection_requests.go similarity index 100% rename from connmanager/connection_requests.go rename to network/connmanager/connection_requests.go diff --git a/connmanager/connection_set.go b/network/connmanager/connection_set.go similarity index 93% rename from connmanager/connection_set.go rename to network/connmanager/connection_set.go index a37d13572..4096ffac1 100644 --- a/connmanager/connection_set.go +++ b/network/connmanager/connection_set.go @@ -1,7 +1,7 @@ package connmanager import ( - "github.com/kaspanet/kaspad/netadapter" + "github.com/kaspanet/kaspad/network/netadapter" ) type connectionSet map[string]*netadapter.NetConnection diff --git a/connmanager/connmanager.go b/network/connmanager/connmanager.go similarity index 96% rename from connmanager/connmanager.go rename to network/connmanager/connmanager.go index 8abab6ee1..0b2e97382 100644 --- a/connmanager/connmanager.go +++ b/network/connmanager/connmanager.go @@ -5,11 +5,11 @@ import ( "sync/atomic" "time" - "github.com/kaspanet/kaspad/addressmanager" + "github.com/kaspanet/kaspad/network/addressmanager" - "github.com/kaspanet/kaspad/netadapter" + "github.com/kaspanet/kaspad/network/netadapter" - "github.com/kaspanet/kaspad/config" + "github.com/kaspanet/kaspad/infrastructure/config" ) // connectionRequest represents a user request (either through CLI or RPC) to connect to a certain node diff --git a/connmanager/incoming_connections.go b/network/connmanager/incoming_connections.go similarity index 100% rename from connmanager/incoming_connections.go rename to network/connmanager/incoming_connections.go diff --git a/connmanager/log.go b/network/connmanager/log.go similarity index 76% rename from connmanager/log.go rename to network/connmanager/log.go index 326214611..69c7267fc 100644 --- a/connmanager/log.go +++ b/network/connmanager/log.go @@ -1,7 +1,7 @@ package connmanager import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/connmanager/outgoing_connections.go b/network/connmanager/outgoing_connections.go similarity index 100% rename from connmanager/outgoing_connections.go rename to network/connmanager/outgoing_connections.go diff --git a/dnsseed/log.go b/network/dnsseed/log.go similarity index 87% rename from dnsseed/log.go rename to network/dnsseed/log.go index 9ac00e6d8..119bdbbdd 100644 --- a/dnsseed/log.go +++ b/network/dnsseed/log.go @@ -5,7 +5,7 @@ package dnsseed import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/dnsseed/seed.go b/network/dnsseed/seed.go similarity index 96% rename from dnsseed/seed.go rename to network/dnsseed/seed.go index b0fa15343..149c54888 100644 --- a/dnsseed/seed.go +++ b/network/dnsseed/seed.go @@ -6,6 +6,7 @@ package dnsseed import ( "fmt" + "github.com/kaspanet/kaspad/network/domainmessage" "math/rand" "net" "strconv" @@ -15,8 +16,7 @@ import ( "github.com/kaspanet/kaspad/util/subnetworkid" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/domain/dagconfig" ) const ( diff --git a/domainmessage/README.md b/network/domainmessage/README.md similarity index 100% rename from domainmessage/README.md rename to network/domainmessage/README.md diff --git a/domainmessage/base_message.go b/network/domainmessage/base_message.go similarity index 100% rename from domainmessage/base_message.go rename to network/domainmessage/base_message.go diff --git a/domainmessage/bench_test.go b/network/domainmessage/bench_test.go similarity index 100% rename from domainmessage/bench_test.go rename to network/domainmessage/bench_test.go diff --git a/domainmessage/blockheader.go b/network/domainmessage/blockheader.go similarity index 100% rename from domainmessage/blockheader.go rename to network/domainmessage/blockheader.go diff --git a/domainmessage/blockheader_test.go b/network/domainmessage/blockheader_test.go similarity index 100% rename from domainmessage/blockheader_test.go rename to network/domainmessage/blockheader_test.go diff --git a/domainmessage/common.go b/network/domainmessage/common.go similarity index 99% rename from domainmessage/common.go rename to network/domainmessage/common.go index 73206dc66..ac47d1a57 100644 --- a/domainmessage/common.go +++ b/network/domainmessage/common.go @@ -7,7 +7,7 @@ package domainmessage import ( "encoding/binary" "fmt" - "github.com/kaspanet/kaspad/netadapter/id" + "github.com/kaspanet/kaspad/network/netadapter/id" "github.com/kaspanet/kaspad/util/binaryserializer" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/mstime" diff --git a/domainmessage/common_test.go b/network/domainmessage/common_test.go similarity index 100% rename from domainmessage/common_test.go rename to network/domainmessage/common_test.go diff --git a/domainmessage/doc.go b/network/domainmessage/doc.go similarity index 100% rename from domainmessage/doc.go rename to network/domainmessage/doc.go diff --git a/domainmessage/error.go b/network/domainmessage/error.go similarity index 100% rename from domainmessage/error.go rename to network/domainmessage/error.go diff --git a/domainmessage/fakemessage_test.go b/network/domainmessage/fakemessage_test.go similarity index 100% rename from domainmessage/fakemessage_test.go rename to network/domainmessage/fakemessage_test.go diff --git a/domainmessage/fixedIO_test.go b/network/domainmessage/fixedIO_test.go similarity index 100% rename from domainmessage/fixedIO_test.go rename to network/domainmessage/fixedIO_test.go diff --git a/domainmessage/message.go b/network/domainmessage/message.go similarity index 100% rename from domainmessage/message.go rename to network/domainmessage/message.go diff --git a/domainmessage/msgaddresses.go b/network/domainmessage/msgaddresses.go similarity index 100% rename from domainmessage/msgaddresses.go rename to network/domainmessage/msgaddresses.go diff --git a/domainmessage/msgaddresses_test.go b/network/domainmessage/msgaddresses_test.go similarity index 100% rename from domainmessage/msgaddresses_test.go rename to network/domainmessage/msgaddresses_test.go diff --git a/domainmessage/msgblock.go b/network/domainmessage/msgblock.go similarity index 100% rename from domainmessage/msgblock.go rename to network/domainmessage/msgblock.go diff --git a/domainmessage/msgblock_test.go b/network/domainmessage/msgblock_test.go similarity index 100% rename from domainmessage/msgblock_test.go rename to network/domainmessage/msgblock_test.go diff --git a/domainmessage/msgblocklocator.go b/network/domainmessage/msgblocklocator.go similarity index 100% rename from domainmessage/msgblocklocator.go rename to network/domainmessage/msgblocklocator.go diff --git a/domainmessage/msgblocklocator_test.go b/network/domainmessage/msgblocklocator_test.go similarity index 100% rename from domainmessage/msgblocklocator_test.go rename to network/domainmessage/msgblocklocator_test.go diff --git a/domainmessage/msgdoneibdblocks.go b/network/domainmessage/msgdoneibdblocks.go similarity index 100% rename from domainmessage/msgdoneibdblocks.go rename to network/domainmessage/msgdoneibdblocks.go diff --git a/domainmessage/msgibdblock.go b/network/domainmessage/msgibdblock.go similarity index 100% rename from domainmessage/msgibdblock.go rename to network/domainmessage/msgibdblock.go diff --git a/domainmessage/msgibdblock_test.go b/network/domainmessage/msgibdblock_test.go similarity index 100% rename from domainmessage/msgibdblock_test.go rename to network/domainmessage/msgibdblock_test.go diff --git a/domainmessage/msginvrelayblock.go b/network/domainmessage/msginvrelayblock.go similarity index 100% rename from domainmessage/msginvrelayblock.go rename to network/domainmessage/msginvrelayblock.go diff --git a/domainmessage/msginvtransaction.go b/network/domainmessage/msginvtransaction.go similarity index 100% rename from domainmessage/msginvtransaction.go rename to network/domainmessage/msginvtransaction.go diff --git a/domainmessage/msgping.go b/network/domainmessage/msgping.go similarity index 100% rename from domainmessage/msgping.go rename to network/domainmessage/msgping.go diff --git a/domainmessage/msgping_test.go b/network/domainmessage/msgping_test.go similarity index 100% rename from domainmessage/msgping_test.go rename to network/domainmessage/msgping_test.go diff --git a/domainmessage/msgpong.go b/network/domainmessage/msgpong.go similarity index 100% rename from domainmessage/msgpong.go rename to network/domainmessage/msgpong.go diff --git a/domainmessage/msgpong_test.go b/network/domainmessage/msgpong_test.go similarity index 100% rename from domainmessage/msgpong_test.go rename to network/domainmessage/msgpong_test.go diff --git a/domainmessage/msgreject.go b/network/domainmessage/msgreject.go similarity index 100% rename from domainmessage/msgreject.go rename to network/domainmessage/msgreject.go diff --git a/domainmessage/msgrequestaddresses.go b/network/domainmessage/msgrequestaddresses.go similarity index 100% rename from domainmessage/msgrequestaddresses.go rename to network/domainmessage/msgrequestaddresses.go diff --git a/domainmessage/msgrequestaddresses_test.go b/network/domainmessage/msgrequestaddresses_test.go similarity index 100% rename from domainmessage/msgrequestaddresses_test.go rename to network/domainmessage/msgrequestaddresses_test.go diff --git a/domainmessage/msgrequestblocklocator.go b/network/domainmessage/msgrequestblocklocator.go similarity index 100% rename from domainmessage/msgrequestblocklocator.go rename to network/domainmessage/msgrequestblocklocator.go diff --git a/domainmessage/msgrequestblocklocator_test.go b/network/domainmessage/msgrequestblocklocator_test.go similarity index 100% rename from domainmessage/msgrequestblocklocator_test.go rename to network/domainmessage/msgrequestblocklocator_test.go diff --git a/domainmessage/msgrequestibdblocks.go b/network/domainmessage/msgrequestibdblocks.go similarity index 100% rename from domainmessage/msgrequestibdblocks.go rename to network/domainmessage/msgrequestibdblocks.go diff --git a/domainmessage/msgrequestibdblocks_test.go b/network/domainmessage/msgrequestibdblocks_test.go similarity index 100% rename from domainmessage/msgrequestibdblocks_test.go rename to network/domainmessage/msgrequestibdblocks_test.go diff --git a/domainmessage/msgrequestnextibdblocks.go b/network/domainmessage/msgrequestnextibdblocks.go similarity index 100% rename from domainmessage/msgrequestnextibdblocks.go rename to network/domainmessage/msgrequestnextibdblocks.go diff --git a/domainmessage/msgrequestrelayblocks.go b/network/domainmessage/msgrequestrelayblocks.go similarity index 100% rename from domainmessage/msgrequestrelayblocks.go rename to network/domainmessage/msgrequestrelayblocks.go diff --git a/domainmessage/msgrequestselectedtip.go b/network/domainmessage/msgrequestselectedtip.go similarity index 100% rename from domainmessage/msgrequestselectedtip.go rename to network/domainmessage/msgrequestselectedtip.go diff --git a/domainmessage/msgrequestselectedtip_test.go b/network/domainmessage/msgrequestselectedtip_test.go similarity index 100% rename from domainmessage/msgrequestselectedtip_test.go rename to network/domainmessage/msgrequestselectedtip_test.go diff --git a/domainmessage/msgrequesttransactions.go b/network/domainmessage/msgrequesttransactions.go similarity index 100% rename from domainmessage/msgrequesttransactions.go rename to network/domainmessage/msgrequesttransactions.go diff --git a/domainmessage/msgselectedtip.go b/network/domainmessage/msgselectedtip.go similarity index 100% rename from domainmessage/msgselectedtip.go rename to network/domainmessage/msgselectedtip.go diff --git a/domainmessage/msgselectedtip_test.go b/network/domainmessage/msgselectedtip_test.go similarity index 100% rename from domainmessage/msgselectedtip_test.go rename to network/domainmessage/msgselectedtip_test.go diff --git a/domainmessage/msgtransactionnotfound.go b/network/domainmessage/msgtransactionnotfound.go similarity index 100% rename from domainmessage/msgtransactionnotfound.go rename to network/domainmessage/msgtransactionnotfound.go diff --git a/domainmessage/msgtx.go b/network/domainmessage/msgtx.go similarity index 100% rename from domainmessage/msgtx.go rename to network/domainmessage/msgtx.go diff --git a/domainmessage/msgtx_test.go b/network/domainmessage/msgtx_test.go similarity index 100% rename from domainmessage/msgtx_test.go rename to network/domainmessage/msgtx_test.go diff --git a/domainmessage/msgverack.go b/network/domainmessage/msgverack.go similarity index 100% rename from domainmessage/msgverack.go rename to network/domainmessage/msgverack.go diff --git a/domainmessage/msgverack_test.go b/network/domainmessage/msgverack_test.go similarity index 100% rename from domainmessage/msgverack_test.go rename to network/domainmessage/msgverack_test.go diff --git a/domainmessage/msgversion.go b/network/domainmessage/msgversion.go similarity index 97% rename from domainmessage/msgversion.go rename to network/domainmessage/msgversion.go index 8f334f2fe..7f124f162 100644 --- a/domainmessage/msgversion.go +++ b/network/domainmessage/msgversion.go @@ -6,11 +6,11 @@ package domainmessage import ( "fmt" + "github.com/kaspanet/kaspad/infrastructure/version" "strings" - "github.com/kaspanet/kaspad/netadapter/id" + "github.com/kaspanet/kaspad/network/netadapter/id" "github.com/kaspanet/kaspad/util/mstime" - "github.com/kaspanet/kaspad/version" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/subnetworkid" diff --git a/domainmessage/msgversion_test.go b/network/domainmessage/msgversion_test.go similarity index 98% rename from domainmessage/msgversion_test.go rename to network/domainmessage/msgversion_test.go index cb3317959..923228f5f 100644 --- a/domainmessage/msgversion_test.go +++ b/network/domainmessage/msgversion_test.go @@ -6,7 +6,7 @@ package domainmessage import ( "github.com/davecgh/go-spew/spew" - "github.com/kaspanet/kaspad/netadapter/id" + "github.com/kaspanet/kaspad/network/netadapter/id" "github.com/kaspanet/kaspad/util/daghash" "net" "reflect" diff --git a/domainmessage/netaddress.go b/network/domainmessage/netaddress.go similarity index 100% rename from domainmessage/netaddress.go rename to network/domainmessage/netaddress.go diff --git a/domainmessage/netaddress_test.go b/network/domainmessage/netaddress_test.go similarity index 100% rename from domainmessage/netaddress_test.go rename to network/domainmessage/netaddress_test.go diff --git a/domainmessage/protocol.go b/network/domainmessage/protocol.go similarity index 100% rename from domainmessage/protocol.go rename to network/domainmessage/protocol.go diff --git a/domainmessage/protocol_test.go b/network/domainmessage/protocol_test.go similarity index 100% rename from domainmessage/protocol_test.go rename to network/domainmessage/protocol_test.go diff --git a/domainmessage/testdata/megatx.bin.bz2 b/network/domainmessage/testdata/megatx.bin.bz2 similarity index 100% rename from domainmessage/testdata/megatx.bin.bz2 rename to network/domainmessage/testdata/megatx.bin.bz2 diff --git a/netadapter/id/id.go b/network/netadapter/id/id.go similarity index 100% rename from netadapter/id/id.go rename to network/netadapter/id/id.go diff --git a/netadapter/log.go b/network/netadapter/log.go similarity index 76% rename from netadapter/log.go rename to network/netadapter/log.go index 899583163..cd0c9b2e0 100644 --- a/netadapter/log.go +++ b/network/netadapter/log.go @@ -1,7 +1,7 @@ package netadapter import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/netadapter/netadapter.go b/network/netadapter/netadapter.go similarity index 93% rename from netadapter/netadapter.go rename to network/netadapter/netadapter.go index da084f166..71688cf43 100644 --- a/netadapter/netadapter.go +++ b/network/netadapter/netadapter.go @@ -6,12 +6,12 @@ import ( "sync" "sync/atomic" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/id" - routerpkg "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/netadapter/server" - "github.com/kaspanet/kaspad/netadapter/server/grpcserver" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/id" + routerpkg "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/netadapter/server" + "github.com/kaspanet/kaspad/network/netadapter/server/grpcserver" "github.com/pkg/errors" ) diff --git a/netadapter/netadapter_test.go b/network/netadapter/netadapter_test.go similarity index 96% rename from netadapter/netadapter_test.go rename to network/netadapter/netadapter_test.go index 0a468fdf9..134aa92dc 100644 --- a/netadapter/netadapter_test.go +++ b/network/netadapter/netadapter_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/netadapter/router" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/network/netadapter/router" ) // routerInitializerForTest returns new RouterInitializer which simply sets diff --git a/netadapter/netconnection.go b/network/netadapter/netconnection.go similarity index 91% rename from netadapter/netconnection.go rename to network/netadapter/netconnection.go index 5ea4b381e..db1212e41 100644 --- a/netadapter/netconnection.go +++ b/network/netadapter/netconnection.go @@ -2,12 +2,12 @@ package netadapter import ( "fmt" - "github.com/kaspanet/kaspad/domainmessage" - routerpkg "github.com/kaspanet/kaspad/netadapter/router" + "github.com/kaspanet/kaspad/network/domainmessage" + routerpkg "github.com/kaspanet/kaspad/network/netadapter/router" "github.com/pkg/errors" - "github.com/kaspanet/kaspad/netadapter/id" - "github.com/kaspanet/kaspad/netadapter/server" + "github.com/kaspanet/kaspad/network/netadapter/id" + "github.com/kaspanet/kaspad/network/netadapter/server" ) // NetConnection is a wrapper to a server connection for use by services external to NetAdapter diff --git a/netadapter/router/route.go b/network/netadapter/router/route.go similarity index 95% rename from netadapter/router/route.go rename to network/netadapter/router/route.go index 5c1a5466b..de248e9aa 100644 --- a/netadapter/router/route.go +++ b/network/netadapter/router/route.go @@ -4,9 +4,9 @@ import ( "sync" "time" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/pkg/errors" ) diff --git a/netadapter/router/router.go b/network/netadapter/router/router.go similarity index 98% rename from netadapter/router/router.go rename to network/netadapter/router/router.go index 09afc0aa2..6e1ae3073 100644 --- a/netadapter/router/router.go +++ b/network/netadapter/router/router.go @@ -3,7 +3,7 @@ package router import ( "sync" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/pkg/errors" ) diff --git a/netadapter/server/grpcserver/connection_loops.go b/network/netadapter/server/grpcserver/connection_loops.go similarity index 92% rename from netadapter/server/grpcserver/connection_loops.go rename to network/netadapter/server/grpcserver/connection_loops.go index f2b982df3..d0272b493 100644 --- a/netadapter/server/grpcserver/connection_loops.go +++ b/network/netadapter/server/grpcserver/connection_loops.go @@ -4,13 +4,13 @@ import ( "io" "time" - routerpkg "github.com/kaspanet/kaspad/netadapter/router" + routerpkg "github.com/kaspanet/kaspad/network/netadapter/router" "github.com/pkg/errors" "github.com/davecgh/go-spew/spew" - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" - "github.com/kaspanet/kaspad/netadapter/server/grpcserver/protowire" + "github.com/kaspanet/kaspad/network/netadapter/server/grpcserver/protowire" ) type grpcStream interface { diff --git a/netadapter/server/grpcserver/grpc_connection.go b/network/netadapter/server/grpcserver/grpc_connection.go similarity index 93% rename from netadapter/server/grpcserver/grpc_connection.go rename to network/netadapter/server/grpcserver/grpc_connection.go index 80007ed68..01378e813 100644 --- a/netadapter/server/grpcserver/grpc_connection.go +++ b/network/netadapter/server/grpcserver/grpc_connection.go @@ -6,10 +6,10 @@ import ( "sync/atomic" "time" - "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/netadapter/server/grpcserver/protowire" + "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/netadapter/server/grpcserver/protowire" - "github.com/kaspanet/kaspad/netadapter/server" + "github.com/kaspanet/kaspad/network/netadapter/server" "google.golang.org/grpc" ) diff --git a/netadapter/server/grpcserver/grpc_server.go b/network/netadapter/server/grpcserver/grpc_server.go similarity index 95% rename from netadapter/server/grpcserver/grpc_server.go rename to network/netadapter/server/grpcserver/grpc_server.go index f9cf141d3..28df1e232 100644 --- a/netadapter/server/grpcserver/grpc_server.go +++ b/network/netadapter/server/grpcserver/grpc_server.go @@ -9,8 +9,8 @@ import ( "google.golang.org/grpc/peer" - "github.com/kaspanet/kaspad/netadapter/server" - "github.com/kaspanet/kaspad/netadapter/server/grpcserver/protowire" + "github.com/kaspanet/kaspad/network/netadapter/server" + "github.com/kaspanet/kaspad/network/netadapter/server/grpcserver/protowire" "github.com/kaspanet/kaspad/util/panics" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/netadapter/server/grpcserver/log.go b/network/netadapter/server/grpcserver/log.go similarity index 86% rename from netadapter/server/grpcserver/log.go rename to network/netadapter/server/grpcserver/log.go index 26f381d32..0cae84e38 100644 --- a/netadapter/server/grpcserver/log.go +++ b/network/netadapter/server/grpcserver/log.go @@ -5,7 +5,7 @@ package grpcserver import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/netadapter/server/grpcserver/p2pserver.go b/network/netadapter/server/grpcserver/p2pserver.go similarity index 92% rename from netadapter/server/grpcserver/p2pserver.go rename to network/netadapter/server/grpcserver/p2pserver.go index 8b84d16ad..f32d75ff1 100644 --- a/netadapter/server/grpcserver/p2pserver.go +++ b/network/netadapter/server/grpcserver/p2pserver.go @@ -1,7 +1,7 @@ package grpcserver import ( - "github.com/kaspanet/kaspad/netadapter/server/grpcserver/protowire" + "github.com/kaspanet/kaspad/network/netadapter/server/grpcserver/protowire" "github.com/kaspanet/kaspad/util/panics" "github.com/pkg/errors" "google.golang.org/grpc/peer" diff --git a/netadapter/server/grpcserver/protowire/README.md b/network/netadapter/server/grpcserver/protowire/README.md similarity index 100% rename from netadapter/server/grpcserver/protowire/README.md rename to network/netadapter/server/grpcserver/protowire/README.md diff --git a/netadapter/server/grpcserver/protowire/common.go b/network/netadapter/server/grpcserver/protowire/common.go similarity index 97% rename from netadapter/server/grpcserver/protowire/common.go rename to network/netadapter/server/grpcserver/protowire/common.go index ec475af5a..627a61e9a 100644 --- a/netadapter/server/grpcserver/protowire/common.go +++ b/network/netadapter/server/grpcserver/protowire/common.go @@ -3,7 +3,7 @@ package protowire import ( "math" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/mstime" "github.com/kaspanet/kaspad/util/subnetworkid" diff --git a/netadapter/server/grpcserver/protowire/generate.go b/network/netadapter/server/grpcserver/protowire/generate.go similarity index 100% rename from netadapter/server/grpcserver/protowire/generate.go rename to network/netadapter/server/grpcserver/protowire/generate.go diff --git a/netadapter/server/grpcserver/protowire/message_addresses.go b/network/netadapter/server/grpcserver/protowire/message_addresses.go similarity index 96% rename from netadapter/server/grpcserver/protowire/message_addresses.go rename to network/netadapter/server/grpcserver/protowire/message_addresses.go index 6984718a9..21646eca0 100644 --- a/netadapter/server/grpcserver/protowire/message_addresses.go +++ b/network/netadapter/server/grpcserver/protowire/message_addresses.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/pkg/errors" ) diff --git a/netadapter/server/grpcserver/protowire/message_block.go b/network/netadapter/server/grpcserver/protowire/message_block.go similarity index 98% rename from netadapter/server/grpcserver/protowire/message_block.go rename to network/netadapter/server/grpcserver/protowire/message_block.go index 72ea3d8cf..0bb469cb0 100644 --- a/netadapter/server/grpcserver/protowire/message_block.go +++ b/network/netadapter/server/grpcserver/protowire/message_block.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/mstime" "github.com/pkg/errors" ) diff --git a/netadapter/server/grpcserver/protowire/message_block_locator.go b/network/netadapter/server/grpcserver/protowire/message_block_locator.go similarity index 95% rename from netadapter/server/grpcserver/protowire/message_block_locator.go rename to network/netadapter/server/grpcserver/protowire/message_block_locator.go index 09fc1ab4c..13b0bb6a6 100644 --- a/netadapter/server/grpcserver/protowire/message_block_locator.go +++ b/network/netadapter/server/grpcserver/protowire/message_block_locator.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/pkg/errors" ) diff --git a/netadapter/server/grpcserver/protowire/message_done_ibd_blocks.go b/network/netadapter/server/grpcserver/protowire/message_done_ibd_blocks.go similarity index 82% rename from netadapter/server/grpcserver/protowire/message_done_ibd_blocks.go rename to network/netadapter/server/grpcserver/protowire/message_done_ibd_blocks.go index c7c91d5d9..e5fb559ac 100644 --- a/netadapter/server/grpcserver/protowire/message_done_ibd_blocks.go +++ b/network/netadapter/server/grpcserver/protowire/message_done_ibd_blocks.go @@ -1,6 +1,6 @@ package protowire -import "github.com/kaspanet/kaspad/domainmessage" +import "github.com/kaspanet/kaspad/network/domainmessage" func (x *KaspadMessage_DoneIBDBlocks) toDomainMessage() (domainmessage.Message, error) { return &domainmessage.MsgDoneIBDBlocks{}, nil diff --git a/netadapter/server/grpcserver/protowire/message_ibd_block.go b/network/netadapter/server/grpcserver/protowire/message_ibd_block.go similarity index 89% rename from netadapter/server/grpcserver/protowire/message_ibd_block.go rename to network/netadapter/server/grpcserver/protowire/message_ibd_block.go index 46516dce2..3f3f5e084 100644 --- a/netadapter/server/grpcserver/protowire/message_ibd_block.go +++ b/network/netadapter/server/grpcserver/protowire/message_ibd_block.go @@ -1,6 +1,6 @@ package protowire -import "github.com/kaspanet/kaspad/domainmessage" +import "github.com/kaspanet/kaspad/network/domainmessage" func (x *KaspadMessage_IbdBlock) toDomainMessage() (domainmessage.Message, error) { msgBlock, err := x.IbdBlock.toDomainMessage() diff --git a/netadapter/server/grpcserver/protowire/message_inv_relay_block.go b/network/netadapter/server/grpcserver/protowire/message_inv_relay_block.go similarity index 89% rename from netadapter/server/grpcserver/protowire/message_inv_relay_block.go rename to network/netadapter/server/grpcserver/protowire/message_inv_relay_block.go index fd366a01c..f854b6d79 100644 --- a/netadapter/server/grpcserver/protowire/message_inv_relay_block.go +++ b/network/netadapter/server/grpcserver/protowire/message_inv_relay_block.go @@ -1,6 +1,6 @@ package protowire -import "github.com/kaspanet/kaspad/domainmessage" +import "github.com/kaspanet/kaspad/network/domainmessage" func (x *KaspadMessage_InvRelayBlock) toDomainMessage() (domainmessage.Message, error) { hash, err := x.InvRelayBlock.Hash.toWire() diff --git a/netadapter/server/grpcserver/protowire/message_inv_transactions.go b/network/netadapter/server/grpcserver/protowire/message_inv_transactions.go similarity index 94% rename from netadapter/server/grpcserver/protowire/message_inv_transactions.go rename to network/netadapter/server/grpcserver/protowire/message_inv_transactions.go index 9640f9303..3160acaa6 100644 --- a/netadapter/server/grpcserver/protowire/message_inv_transactions.go +++ b/network/netadapter/server/grpcserver/protowire/message_inv_transactions.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/pkg/errors" ) diff --git a/netadapter/server/grpcserver/protowire/message_ping.go b/network/netadapter/server/grpcserver/protowire/message_ping.go similarity index 86% rename from netadapter/server/grpcserver/protowire/message_ping.go rename to network/netadapter/server/grpcserver/protowire/message_ping.go index 682af3283..620740c53 100644 --- a/netadapter/server/grpcserver/protowire/message_ping.go +++ b/network/netadapter/server/grpcserver/protowire/message_ping.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" ) func (x *KaspadMessage_Ping) toDomainMessage() (domainmessage.Message, error) { diff --git a/netadapter/server/grpcserver/protowire/message_pong.go b/network/netadapter/server/grpcserver/protowire/message_pong.go similarity index 86% rename from netadapter/server/grpcserver/protowire/message_pong.go rename to network/netadapter/server/grpcserver/protowire/message_pong.go index cc8dc09dd..81cd16bcb 100644 --- a/netadapter/server/grpcserver/protowire/message_pong.go +++ b/network/netadapter/server/grpcserver/protowire/message_pong.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" ) func (x *KaspadMessage_Pong) toDomainMessage() (domainmessage.Message, error) { diff --git a/netadapter/server/grpcserver/protowire/message_reject.go b/network/netadapter/server/grpcserver/protowire/message_reject.go similarity index 86% rename from netadapter/server/grpcserver/protowire/message_reject.go rename to network/netadapter/server/grpcserver/protowire/message_reject.go index 47bd526ed..3bdb427fd 100644 --- a/netadapter/server/grpcserver/protowire/message_reject.go +++ b/network/netadapter/server/grpcserver/protowire/message_reject.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" ) func (x *KaspadMessage_Reject) toWireMessage() (domainmessage.Message, error) { diff --git a/netadapter/server/grpcserver/protowire/message_request_addresses.go b/network/netadapter/server/grpcserver/protowire/message_request_addresses.go similarity index 93% rename from netadapter/server/grpcserver/protowire/message_request_addresses.go rename to network/netadapter/server/grpcserver/protowire/message_request_addresses.go index 99ee88086..a43ae7e2a 100644 --- a/netadapter/server/grpcserver/protowire/message_request_addresses.go +++ b/network/netadapter/server/grpcserver/protowire/message_request_addresses.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" ) func (x *KaspadMessage_RequestAddresses) toDomainMessage() (domainmessage.Message, error) { diff --git a/netadapter/server/grpcserver/protowire/message_request_block_locator.go b/network/netadapter/server/grpcserver/protowire/message_request_block_locator.go similarity index 92% rename from netadapter/server/grpcserver/protowire/message_request_block_locator.go rename to network/netadapter/server/grpcserver/protowire/message_request_block_locator.go index be7785630..8d3af96bc 100644 --- a/netadapter/server/grpcserver/protowire/message_request_block_locator.go +++ b/network/netadapter/server/grpcserver/protowire/message_request_block_locator.go @@ -1,6 +1,6 @@ package protowire -import "github.com/kaspanet/kaspad/domainmessage" +import "github.com/kaspanet/kaspad/network/domainmessage" func (x *KaspadMessage_RequestBlockLocator) toDomainMessage() (domainmessage.Message, error) { lowHash, err := x.RequestBlockLocator.LowHash.toWire() diff --git a/netadapter/server/grpcserver/protowire/message_request_ibd_blocks.go b/network/netadapter/server/grpcserver/protowire/message_request_ibd_blocks.go similarity index 92% rename from netadapter/server/grpcserver/protowire/message_request_ibd_blocks.go rename to network/netadapter/server/grpcserver/protowire/message_request_ibd_blocks.go index 74c1ab4f1..c2477dd52 100644 --- a/netadapter/server/grpcserver/protowire/message_request_ibd_blocks.go +++ b/network/netadapter/server/grpcserver/protowire/message_request_ibd_blocks.go @@ -1,6 +1,6 @@ package protowire -import "github.com/kaspanet/kaspad/domainmessage" +import "github.com/kaspanet/kaspad/network/domainmessage" func (x *KaspadMessage_RequestIBDBlocks) toDomainMessage() (domainmessage.Message, error) { lowHash, err := x.RequestIBDBlocks.LowHash.toWire() diff --git a/netadapter/server/grpcserver/protowire/message_request_next_ibd_blocks.go b/network/netadapter/server/grpcserver/protowire/message_request_next_ibd_blocks.go similarity index 83% rename from netadapter/server/grpcserver/protowire/message_request_next_ibd_blocks.go rename to network/netadapter/server/grpcserver/protowire/message_request_next_ibd_blocks.go index f1da7c1ae..519d4f00c 100644 --- a/netadapter/server/grpcserver/protowire/message_request_next_ibd_blocks.go +++ b/network/netadapter/server/grpcserver/protowire/message_request_next_ibd_blocks.go @@ -1,6 +1,6 @@ package protowire -import "github.com/kaspanet/kaspad/domainmessage" +import "github.com/kaspanet/kaspad/network/domainmessage" func (x *KaspadMessage_RequestNextIBDBlocks) toDomainMessage() (domainmessage.Message, error) { return &domainmessage.MsgRequestNextIBDBlocks{}, nil diff --git a/netadapter/server/grpcserver/protowire/message_request_relay_blocks.go b/network/netadapter/server/grpcserver/protowire/message_request_relay_blocks.go similarity index 95% rename from netadapter/server/grpcserver/protowire/message_request_relay_blocks.go rename to network/netadapter/server/grpcserver/protowire/message_request_relay_blocks.go index 9027e206f..49af69521 100644 --- a/netadapter/server/grpcserver/protowire/message_request_relay_blocks.go +++ b/network/netadapter/server/grpcserver/protowire/message_request_relay_blocks.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/pkg/errors" ) diff --git a/netadapter/server/grpcserver/protowire/message_request_selected_tip.go b/network/netadapter/server/grpcserver/protowire/message_request_selected_tip.go similarity index 83% rename from netadapter/server/grpcserver/protowire/message_request_selected_tip.go rename to network/netadapter/server/grpcserver/protowire/message_request_selected_tip.go index f799296f2..8392fe172 100644 --- a/netadapter/server/grpcserver/protowire/message_request_selected_tip.go +++ b/network/netadapter/server/grpcserver/protowire/message_request_selected_tip.go @@ -1,6 +1,6 @@ package protowire -import "github.com/kaspanet/kaspad/domainmessage" +import "github.com/kaspanet/kaspad/network/domainmessage" func (x *KaspadMessage_RequestSelectedTip) toDomainMessage() (domainmessage.Message, error) { return &domainmessage.MsgRequestSelectedTip{}, nil diff --git a/netadapter/server/grpcserver/protowire/message_request_transactions.go b/network/netadapter/server/grpcserver/protowire/message_request_transactions.go similarity index 95% rename from netadapter/server/grpcserver/protowire/message_request_transactions.go rename to network/netadapter/server/grpcserver/protowire/message_request_transactions.go index 4f83cfc82..f8a07b404 100644 --- a/netadapter/server/grpcserver/protowire/message_request_transactions.go +++ b/network/netadapter/server/grpcserver/protowire/message_request_transactions.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/pkg/errors" ) diff --git a/netadapter/server/grpcserver/protowire/message_selected_tip.go b/network/netadapter/server/grpcserver/protowire/message_selected_tip.go similarity index 89% rename from netadapter/server/grpcserver/protowire/message_selected_tip.go rename to network/netadapter/server/grpcserver/protowire/message_selected_tip.go index f03f93e98..0ad94db6e 100644 --- a/netadapter/server/grpcserver/protowire/message_selected_tip.go +++ b/network/netadapter/server/grpcserver/protowire/message_selected_tip.go @@ -1,6 +1,6 @@ package protowire -import "github.com/kaspanet/kaspad/domainmessage" +import "github.com/kaspanet/kaspad/network/domainmessage" func (x *KaspadMessage_SelectedTip) toDomainMessage() (domainmessage.Message, error) { hash, err := x.SelectedTip.SelectedTipHash.toWire() diff --git a/netadapter/server/grpcserver/protowire/message_transaction.go b/network/netadapter/server/grpcserver/protowire/message_transaction.go similarity index 98% rename from netadapter/server/grpcserver/protowire/message_transaction.go rename to network/netadapter/server/grpcserver/protowire/message_transaction.go index 9794f43bc..fa7bc7ccd 100644 --- a/netadapter/server/grpcserver/protowire/message_transaction.go +++ b/network/netadapter/server/grpcserver/protowire/message_transaction.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" ) diff --git a/netadapter/server/grpcserver/protowire/message_transaction_not_found.go b/network/netadapter/server/grpcserver/protowire/message_transaction_not_found.go similarity index 91% rename from netadapter/server/grpcserver/protowire/message_transaction_not_found.go rename to network/netadapter/server/grpcserver/protowire/message_transaction_not_found.go index 03608f745..b122b1853 100644 --- a/netadapter/server/grpcserver/protowire/message_transaction_not_found.go +++ b/network/netadapter/server/grpcserver/protowire/message_transaction_not_found.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" ) func (x *KaspadMessage_TransactionNotFound) toDomainMessage() (domainmessage.Message, error) { diff --git a/netadapter/server/grpcserver/protowire/message_verack.go b/network/netadapter/server/grpcserver/protowire/message_verack.go similarity index 80% rename from netadapter/server/grpcserver/protowire/message_verack.go rename to network/netadapter/server/grpcserver/protowire/message_verack.go index 42fb22049..555c76566 100644 --- a/netadapter/server/grpcserver/protowire/message_verack.go +++ b/network/netadapter/server/grpcserver/protowire/message_verack.go @@ -1,6 +1,6 @@ package protowire -import "github.com/kaspanet/kaspad/domainmessage" +import "github.com/kaspanet/kaspad/network/domainmessage" func (x *KaspadMessage_Verack) toDomainMessage() (domainmessage.Message, error) { return &domainmessage.MsgVerAck{}, nil diff --git a/netadapter/server/grpcserver/protowire/message_version.go b/network/netadapter/server/grpcserver/protowire/message_version.go similarity index 95% rename from netadapter/server/grpcserver/protowire/message_version.go rename to network/netadapter/server/grpcserver/protowire/message_version.go index e8bdc7304..f038784c2 100644 --- a/netadapter/server/grpcserver/protowire/message_version.go +++ b/network/netadapter/server/grpcserver/protowire/message_version.go @@ -1,8 +1,8 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/id" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/id" "github.com/kaspanet/kaspad/util/mstime" ) diff --git a/netadapter/server/grpcserver/protowire/messages.pb.go b/network/netadapter/server/grpcserver/protowire/messages.pb.go similarity index 100% rename from netadapter/server/grpcserver/protowire/messages.pb.go rename to network/netadapter/server/grpcserver/protowire/messages.pb.go diff --git a/netadapter/server/grpcserver/protowire/messages.proto b/network/netadapter/server/grpcserver/protowire/messages.proto similarity index 100% rename from netadapter/server/grpcserver/protowire/messages.proto rename to network/netadapter/server/grpcserver/protowire/messages.proto diff --git a/netadapter/server/grpcserver/protowire/messages_grpc.pb.go b/network/netadapter/server/grpcserver/protowire/messages_grpc.pb.go similarity index 100% rename from netadapter/server/grpcserver/protowire/messages_grpc.pb.go rename to network/netadapter/server/grpcserver/protowire/messages_grpc.pb.go diff --git a/netadapter/server/grpcserver/protowire/wire.go b/network/netadapter/server/grpcserver/protowire/wire.go similarity index 98% rename from netadapter/server/grpcserver/protowire/wire.go rename to network/netadapter/server/grpcserver/protowire/wire.go index 8ce15e3fc..2c0291699 100644 --- a/netadapter/server/grpcserver/protowire/wire.go +++ b/network/netadapter/server/grpcserver/protowire/wire.go @@ -1,7 +1,7 @@ package protowire import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/pkg/errors" ) diff --git a/netadapter/server/server.go b/network/netadapter/server/server.go similarity index 95% rename from netadapter/server/server.go rename to network/netadapter/server/server.go index 8caf213a7..706cac4cc 100644 --- a/netadapter/server/server.go +++ b/network/netadapter/server/server.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/kaspanet/kaspad/netadapter/router" + "github.com/kaspanet/kaspad/network/netadapter/router" ) // OnConnectedHandler is a function that is to be called diff --git a/netadapter/standalone/log.go b/network/netadapter/standalone/log.go similarity index 76% rename from netadapter/standalone/log.go rename to network/netadapter/standalone/log.go index 722c0ec3c..042aad406 100644 --- a/netadapter/standalone/log.go +++ b/network/netadapter/standalone/log.go @@ -1,7 +1,7 @@ package standalone import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/netadapter/standalone/minimal_net_adapter.go b/network/netadapter/standalone/minimal_net_adapter.go similarity index 94% rename from netadapter/standalone/minimal_net_adapter.go rename to network/netadapter/standalone/minimal_net_adapter.go index 86428b4df..b39fcf52d 100644 --- a/netadapter/standalone/minimal_net_adapter.go +++ b/network/netadapter/standalone/minimal_net_adapter.go @@ -3,16 +3,16 @@ package standalone import ( "sync" - "github.com/kaspanet/kaspad/netadapter/id" + "github.com/kaspanet/kaspad/network/netadapter/id" "github.com/kaspanet/kaspad/util/mstime" - "github.com/kaspanet/kaspad/protocol/common" + "github.com/kaspanet/kaspad/network/protocol/common" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/netadapter" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/network/netadapter" "github.com/pkg/errors" ) diff --git a/netadapter/standalone/routes.go b/network/netadapter/standalone/routes.go similarity index 90% rename from netadapter/standalone/routes.go rename to network/netadapter/standalone/routes.go index e9fabbe98..e66dffec5 100644 --- a/netadapter/standalone/routes.go +++ b/network/netadapter/standalone/routes.go @@ -3,12 +3,12 @@ package standalone import ( "time" - "github.com/kaspanet/kaspad/netadapter" + "github.com/kaspanet/kaspad/network/netadapter" "github.com/pkg/errors" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" ) // Routes holds the incoming and outgoing routes of a connection created by MinimalNetAdapter diff --git a/protocol/blocklogger/blocklogger.go b/network/protocol/blocklogger/blocklogger.go similarity index 100% rename from protocol/blocklogger/blocklogger.go rename to network/protocol/blocklogger/blocklogger.go diff --git a/protocol/blocklogger/log.go b/network/protocol/blocklogger/log.go similarity index 81% rename from protocol/blocklogger/log.go rename to network/protocol/blocklogger/log.go index adbfde447..c28108500 100644 --- a/protocol/blocklogger/log.go +++ b/network/protocol/blocklogger/log.go @@ -5,7 +5,7 @@ package blocklogger import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" ) var log, _ = logger.Get(logger.SubsystemTags.PROT) diff --git a/protocol/common/common.go b/network/protocol/common/common.go similarity index 100% rename from protocol/common/common.go rename to network/protocol/common/common.go diff --git a/protocol/flowcontext/addresses.go b/network/protocol/flowcontext/addresses.go similarity index 79% rename from protocol/flowcontext/addresses.go rename to network/protocol/flowcontext/addresses.go index bd0a94a98..b2a7d339e 100644 --- a/protocol/flowcontext/addresses.go +++ b/network/protocol/flowcontext/addresses.go @@ -1,7 +1,7 @@ package flowcontext import ( - "github.com/kaspanet/kaspad/addressmanager" + "github.com/kaspanet/kaspad/network/addressmanager" ) // AddressManager returns the address manager associated to the flow context. diff --git a/protocol/flowcontext/blocks.go b/network/protocol/flowcontext/blocks.go similarity index 92% rename from protocol/flowcontext/blocks.go rename to network/protocol/flowcontext/blocks.go index f7cc19c80..6ffbf1917 100644 --- a/protocol/flowcontext/blocks.go +++ b/network/protocol/flowcontext/blocks.go @@ -3,9 +3,9 @@ package flowcontext import ( "sync/atomic" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/protocol/flows/blockrelay" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/protocol/flows/blockrelay" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/protocol/flowcontext/config.go b/network/protocol/flowcontext/config.go similarity index 74% rename from protocol/flowcontext/config.go rename to network/protocol/flowcontext/config.go index 65aeddfb4..fa6cf1f53 100644 --- a/protocol/flowcontext/config.go +++ b/network/protocol/flowcontext/config.go @@ -1,6 +1,6 @@ package flowcontext -import "github.com/kaspanet/kaspad/config" +import "github.com/kaspanet/kaspad/infrastructure/config" // Config returns an instance of *config.Config associated to the flow context. func (f *FlowContext) Config() *config.Config { diff --git a/protocol/flowcontext/consensus.go b/network/protocol/flowcontext/consensus.go similarity index 73% rename from protocol/flowcontext/consensus.go rename to network/protocol/flowcontext/consensus.go index 75d2d2a20..ec67ec674 100644 --- a/protocol/flowcontext/consensus.go +++ b/network/protocol/flowcontext/consensus.go @@ -1,6 +1,6 @@ package flowcontext -import "github.com/kaspanet/kaspad/blockdag" +import "github.com/kaspanet/kaspad/domain/blockdag" // DAG returns the DAG associated to the flow context. func (f *FlowContext) DAG() *blockdag.BlockDAG { diff --git a/protocol/flowcontext/errors.go b/network/protocol/flowcontext/errors.go similarity index 85% rename from protocol/flowcontext/errors.go rename to network/protocol/flowcontext/errors.go index 53f7e365b..946e47522 100644 --- a/protocol/flowcontext/errors.go +++ b/network/protocol/flowcontext/errors.go @@ -4,9 +4,9 @@ import ( "errors" "sync/atomic" - "github.com/kaspanet/kaspad/netadapter/router" + "github.com/kaspanet/kaspad/network/netadapter/router" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" ) // HandleError handles an error from a flow, diff --git a/protocol/flowcontext/flow_context.go b/network/protocol/flowcontext/flow_context.go similarity index 77% rename from protocol/flowcontext/flow_context.go rename to network/protocol/flowcontext/flow_context.go index 9550cc9e4..c4210624b 100644 --- a/protocol/flowcontext/flow_context.go +++ b/network/protocol/flowcontext/flow_context.go @@ -4,16 +4,16 @@ import ( "sync" "time" - "github.com/kaspanet/kaspad/addressmanager" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/connmanager" - "github.com/kaspanet/kaspad/mempool" - "github.com/kaspanet/kaspad/netadapter" - "github.com/kaspanet/kaspad/netadapter/id" - "github.com/kaspanet/kaspad/protocol/flows/blockrelay" - "github.com/kaspanet/kaspad/protocol/flows/relaytransactions" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/mempool" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/network/addressmanager" + "github.com/kaspanet/kaspad/network/connmanager" + "github.com/kaspanet/kaspad/network/netadapter" + "github.com/kaspanet/kaspad/network/netadapter/id" + "github.com/kaspanet/kaspad/network/protocol/flows/blockrelay" + "github.com/kaspanet/kaspad/network/protocol/flows/relaytransactions" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/protocol/flowcontext/ibd.go b/network/protocol/flowcontext/ibd.go similarity index 94% rename from protocol/flowcontext/ibd.go rename to network/protocol/flowcontext/ibd.go index 185322d44..fad5bb880 100644 --- a/protocol/flowcontext/ibd.go +++ b/network/protocol/flowcontext/ibd.go @@ -4,8 +4,8 @@ import ( "sync/atomic" "time" - "github.com/kaspanet/kaspad/blockdag" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" + "github.com/kaspanet/kaspad/domain/blockdag" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" ) // StartIBDIfRequired selects a peer and starts IBD against it diff --git a/protocol/flowcontext/log.go b/network/protocol/flowcontext/log.go similarity index 76% rename from protocol/flowcontext/log.go rename to network/protocol/flowcontext/log.go index 66936bfc1..b41f7e722 100644 --- a/protocol/flowcontext/log.go +++ b/network/protocol/flowcontext/log.go @@ -1,7 +1,7 @@ package flowcontext import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/protocol/flowcontext/network.go b/network/protocol/flowcontext/network.go similarity index 86% rename from protocol/flowcontext/network.go rename to network/protocol/flowcontext/network.go index 822d35d68..1abda0b1c 100644 --- a/protocol/flowcontext/network.go +++ b/network/protocol/flowcontext/network.go @@ -1,11 +1,11 @@ package flowcontext import ( - "github.com/kaspanet/kaspad/connmanager" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter" - "github.com/kaspanet/kaspad/protocol/common" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" + "github.com/kaspanet/kaspad/network/connmanager" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter" + "github.com/kaspanet/kaspad/network/protocol/common" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" "github.com/pkg/errors" ) diff --git a/protocol/flowcontext/transactions.go b/network/protocol/flowcontext/transactions.go similarity index 92% rename from protocol/flowcontext/transactions.go rename to network/protocol/flowcontext/transactions.go index 9b46eb844..e2f322681 100644 --- a/protocol/flowcontext/transactions.go +++ b/network/protocol/flowcontext/transactions.go @@ -1,9 +1,9 @@ package flowcontext import ( - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/mempool" - "github.com/kaspanet/kaspad/protocol/flows/relaytransactions" + "github.com/kaspanet/kaspad/domain/mempool" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/protocol/flows/relaytransactions" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" diff --git a/protocol/flows/addressexchange/receiveaddresses.go b/network/protocol/flows/addressexchange/receiveaddresses.go similarity index 81% rename from protocol/flows/addressexchange/receiveaddresses.go rename to network/protocol/flows/addressexchange/receiveaddresses.go index 6a91caebd..45166b7fd 100644 --- a/protocol/flows/addressexchange/receiveaddresses.go +++ b/network/protocol/flows/addressexchange/receiveaddresses.go @@ -1,13 +1,13 @@ package addressexchange import ( - "github.com/kaspanet/kaspad/addressmanager" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/protocol/common" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/network/addressmanager" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/protocol/common" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" ) // ReceiveAddressesContext is the interface for the context needed for the ReceiveAddresses flow. diff --git a/protocol/flows/addressexchange/sendaddresses.go b/network/protocol/flows/addressexchange/sendaddresses.go similarity index 90% rename from protocol/flows/addressexchange/sendaddresses.go rename to network/protocol/flows/addressexchange/sendaddresses.go index 2f93ba83d..9a8196e49 100644 --- a/protocol/flows/addressexchange/sendaddresses.go +++ b/network/protocol/flows/addressexchange/sendaddresses.go @@ -1,9 +1,9 @@ package addressexchange import ( - "github.com/kaspanet/kaspad/addressmanager" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" + "github.com/kaspanet/kaspad/network/addressmanager" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" "math/rand" ) diff --git a/protocol/flows/blockrelay/handle_relay_block_requests.go b/network/protocol/flows/blockrelay/handle_relay_block_requests.go similarity index 84% rename from protocol/flows/blockrelay/handle_relay_block_requests.go rename to network/protocol/flows/blockrelay/handle_relay_block_requests.go index 345d00f48..dccad5a02 100644 --- a/protocol/flows/blockrelay/handle_relay_block_requests.go +++ b/network/protocol/flows/blockrelay/handle_relay_block_requests.go @@ -1,11 +1,11 @@ package blockrelay import ( - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" "github.com/pkg/errors" ) diff --git a/protocol/flows/blockrelay/handle_relay_invs.go b/network/protocol/flows/blockrelay/handle_relay_invs.go similarity index 93% rename from protocol/flows/blockrelay/handle_relay_invs.go rename to network/protocol/flows/blockrelay/handle_relay_invs.go index 8fa6804b3..38c21434f 100644 --- a/protocol/flows/blockrelay/handle_relay_invs.go +++ b/network/protocol/flows/blockrelay/handle_relay_invs.go @@ -1,14 +1,14 @@ package blockrelay import ( - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter" - "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/protocol/blocklogger" - "github.com/kaspanet/kaspad/protocol/common" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter" + "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/protocol/blocklogger" + "github.com/kaspanet/kaspad/network/protocol/common" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" mathUtil "github.com/kaspanet/kaspad/util/math" diff --git a/protocol/flows/blockrelay/hashes_queue_set.go b/network/protocol/flows/blockrelay/hashes_queue_set.go similarity index 100% rename from protocol/flows/blockrelay/hashes_queue_set.go rename to network/protocol/flows/blockrelay/hashes_queue_set.go diff --git a/protocol/flows/blockrelay/log.go b/network/protocol/flows/blockrelay/log.go similarity index 76% rename from protocol/flows/blockrelay/log.go rename to network/protocol/flows/blockrelay/log.go index 48fe4f83e..5631225d6 100644 --- a/protocol/flows/blockrelay/log.go +++ b/network/protocol/flows/blockrelay/log.go @@ -1,7 +1,7 @@ package blockrelay import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/protocol/flows/blockrelay/shared_requested_blocks.go b/network/protocol/flows/blockrelay/shared_requested_blocks.go similarity index 100% rename from protocol/flows/blockrelay/shared_requested_blocks.go rename to network/protocol/flows/blockrelay/shared_requested_blocks.go diff --git a/protocol/flows/handshake/handshake.go b/network/protocol/flows/handshake/handshake.go similarity index 84% rename from protocol/flows/handshake/handshake.go rename to network/protocol/flows/handshake/handshake.go index ee52ec735..2911c430c 100644 --- a/protocol/flows/handshake/handshake.go +++ b/network/protocol/flows/handshake/handshake.go @@ -4,18 +4,17 @@ import ( "sync" "sync/atomic" - "github.com/kaspanet/kaspad/addressmanager" - "github.com/kaspanet/kaspad/protocol/common" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/network/addressmanager" + "github.com/kaspanet/kaspad/network/protocol/common" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/netadapter" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/network/netadapter" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" - routerpkg "github.com/kaspanet/kaspad/netadapter/router" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" + "github.com/kaspanet/kaspad/network/domainmessage" + routerpkg "github.com/kaspanet/kaspad/network/netadapter/router" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" "github.com/kaspanet/kaspad/util/locks" "github.com/pkg/errors" ) @@ -99,7 +98,7 @@ func HandleHandshake(context HandleHandshakeContext, netConnection *netadapter.N // Handshake is different from other flows, since in it should forward router.ErrRouteClosed to errChan // Therefore we implement a separate handleError for handshake func handleError(err error, flowName string, isStopping *uint32, errChan chan error) { - if errors.Is(err, router.ErrRouteClosed) { + if errors.Is(err, routerpkg.ErrRouteClosed) { if atomic.AddUint32(isStopping, 1) == 1 { errChan <- err } diff --git a/protocol/flows/handshake/log.go b/network/protocol/flows/handshake/log.go similarity index 76% rename from protocol/flows/handshake/log.go rename to network/protocol/flows/handshake/log.go index 0ae220cf9..e05d18609 100644 --- a/protocol/flows/handshake/log.go +++ b/network/protocol/flows/handshake/log.go @@ -1,7 +1,7 @@ package handshake import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/protocol/flows/handshake/receiveversion.go b/network/protocol/flows/handshake/receiveversion.go similarity index 91% rename from protocol/flows/handshake/receiveversion.go rename to network/protocol/flows/handshake/receiveversion.go index aab52a990..8333641de 100644 --- a/protocol/flows/handshake/receiveversion.go +++ b/network/protocol/flows/handshake/receiveversion.go @@ -1,11 +1,11 @@ package handshake import ( - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/protocol/common" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/protocol/common" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" ) var ( diff --git a/protocol/flows/handshake/sendversion.go b/network/protocol/flows/handshake/sendversion.go similarity index 90% rename from protocol/flows/handshake/sendversion.go rename to network/protocol/flows/handshake/sendversion.go index 6e721d013..d40916ade 100644 --- a/protocol/flows/handshake/sendversion.go +++ b/network/protocol/flows/handshake/sendversion.go @@ -1,10 +1,10 @@ package handshake import ( - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/protocol/common" - "github.com/kaspanet/kaspad/version" + "github.com/kaspanet/kaspad/infrastructure/version" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/protocol/common" ) var ( diff --git a/protocol/flows/ibd/handle_request_block_locator.go b/network/protocol/flows/ibd/handle_request_block_locator.go similarity index 89% rename from protocol/flows/ibd/handle_request_block_locator.go rename to network/protocol/flows/ibd/handle_request_block_locator.go index f319cd0da..5b5c68d5c 100644 --- a/protocol/flows/ibd/handle_request_block_locator.go +++ b/network/protocol/flows/ibd/handle_request_block_locator.go @@ -1,10 +1,10 @@ package ibd import ( - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/protocol/flows/ibd/handle_request_ibd_blocks.go b/network/protocol/flows/ibd/handle_request_ibd_blocks.go similarity index 93% rename from protocol/flows/ibd/handle_request_ibd_blocks.go rename to network/protocol/flows/ibd/handle_request_ibd_blocks.go index 5d4475fba..23f17671a 100644 --- a/protocol/flows/ibd/handle_request_ibd_blocks.go +++ b/network/protocol/flows/ibd/handle_request_ibd_blocks.go @@ -2,10 +2,10 @@ package ibd import ( "errors" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/protocol/flows/ibd/ibd.go b/network/protocol/flows/ibd/ibd.go similarity index 94% rename from protocol/flows/ibd/ibd.go rename to network/protocol/flows/ibd/ibd.go index 6dbf54448..836fe0442 100644 --- a/protocol/flows/ibd/ibd.go +++ b/network/protocol/flows/ibd/ibd.go @@ -1,12 +1,12 @@ package ibd import ( - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/protocol/common" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/protocol/common" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/protocol/flows/ibd/log.go b/network/protocol/flows/ibd/log.go similarity index 75% rename from protocol/flows/ibd/log.go rename to network/protocol/flows/ibd/log.go index 570740c06..99d53c983 100644 --- a/protocol/flows/ibd/log.go +++ b/network/protocol/flows/ibd/log.go @@ -1,7 +1,7 @@ package ibd import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/protocol/flows/ibd/selectedtip/handle_request_selected_tip.go b/network/protocol/flows/ibd/selectedtip/handle_request_selected_tip.go similarity index 91% rename from protocol/flows/ibd/selectedtip/handle_request_selected_tip.go rename to network/protocol/flows/ibd/selectedtip/handle_request_selected_tip.go index ded5951e7..8aa1f535d 100644 --- a/protocol/flows/ibd/selectedtip/handle_request_selected_tip.go +++ b/network/protocol/flows/ibd/selectedtip/handle_request_selected_tip.go @@ -1,9 +1,9 @@ package selectedtip import ( - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" "github.com/pkg/errors" ) diff --git a/protocol/flows/ibd/selectedtip/request_selected_tip.go b/network/protocol/flows/ibd/selectedtip/request_selected_tip.go similarity index 87% rename from protocol/flows/ibd/selectedtip/request_selected_tip.go rename to network/protocol/flows/ibd/selectedtip/request_selected_tip.go index d55b4074b..f11f4094a 100644 --- a/protocol/flows/ibd/selectedtip/request_selected_tip.go +++ b/network/protocol/flows/ibd/selectedtip/request_selected_tip.go @@ -1,11 +1,11 @@ package selectedtip import ( - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/protocol/common" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/protocol/common" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/protocol/flows/ping/receive.go b/network/protocol/flows/ping/receive.go similarity index 90% rename from protocol/flows/ping/receive.go rename to network/protocol/flows/ping/receive.go index 89c2e2d24..d6e721092 100644 --- a/protocol/flows/ping/receive.go +++ b/network/protocol/flows/ping/receive.go @@ -1,8 +1,8 @@ package ping import ( - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" ) // ReceivePingsContext is the interface for the context needed for the ReceivePings flow. diff --git a/protocol/flows/ping/send.go b/network/protocol/flows/ping/send.go similarity index 84% rename from protocol/flows/ping/send.go rename to network/protocol/flows/ping/send.go index 6f8bc25dd..774d5c4d0 100644 --- a/protocol/flows/ping/send.go +++ b/network/protocol/flows/ping/send.go @@ -3,11 +3,11 @@ package ping import ( "time" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/protocol/common" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/protocol/common" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" "github.com/kaspanet/kaspad/util/random" ) diff --git a/protocol/flows/rejects/handle_rejects.go b/network/protocol/flows/rejects/handle_rejects.go similarity index 86% rename from protocol/flows/rejects/handle_rejects.go rename to network/protocol/flows/rejects/handle_rejects.go index 4e59448b4..57bc1d67c 100644 --- a/protocol/flows/rejects/handle_rejects.go +++ b/network/protocol/flows/rejects/handle_rejects.go @@ -1,9 +1,9 @@ package rejects import ( - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" ) // HandleRejectsContext is the interface for the context needed for the HandleRejects flow. diff --git a/protocol/flows/relaytransactions/handle_relayed_transactions.go b/network/protocol/flows/relaytransactions/handle_relayed_transactions.go similarity index 94% rename from protocol/flows/relaytransactions/handle_relayed_transactions.go rename to network/protocol/flows/relaytransactions/handle_relayed_transactions.go index de54a5465..e54a81aad 100644 --- a/protocol/flows/relaytransactions/handle_relayed_transactions.go +++ b/network/protocol/flows/relaytransactions/handle_relayed_transactions.go @@ -1,13 +1,13 @@ package relaytransactions import ( - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/mempool" - "github.com/kaspanet/kaspad/netadapter" - "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/protocol/common" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/mempool" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter" + "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/protocol/common" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" diff --git a/protocol/flows/relaytransactions/handle_requested_transactions.go b/network/protocol/flows/relaytransactions/handle_requested_transactions.go similarity index 93% rename from protocol/flows/relaytransactions/handle_requested_transactions.go rename to network/protocol/flows/relaytransactions/handle_requested_transactions.go index abb31a033..033bc639b 100644 --- a/protocol/flows/relaytransactions/handle_requested_transactions.go +++ b/network/protocol/flows/relaytransactions/handle_requested_transactions.go @@ -1,8 +1,8 @@ package relaytransactions import ( - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/router" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/router" ) type handleRequestedTransactionsFlow struct { diff --git a/protocol/flows/relaytransactions/shared_requested_transactions.go b/network/protocol/flows/relaytransactions/shared_requested_transactions.go similarity index 100% rename from protocol/flows/relaytransactions/shared_requested_transactions.go rename to network/protocol/flows/relaytransactions/shared_requested_transactions.go diff --git a/protocol/log.go b/network/protocol/log.go similarity index 76% rename from protocol/log.go rename to network/protocol/log.go index 5edc8a400..591c0c1f1 100644 --- a/protocol/log.go +++ b/network/protocol/log.go @@ -1,7 +1,7 @@ package protocol import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/protocol/manager.go b/network/protocol/manager.go similarity index 81% rename from protocol/manager.go rename to network/protocol/manager.go index 63b07acb2..66c8ec5bd 100644 --- a/protocol/manager.go +++ b/network/protocol/manager.go @@ -3,14 +3,14 @@ package protocol import ( "fmt" - "github.com/kaspanet/kaspad/addressmanager" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/connmanager" - "github.com/kaspanet/kaspad/mempool" - "github.com/kaspanet/kaspad/netadapter" - "github.com/kaspanet/kaspad/protocol/flowcontext" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/mempool" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/network/addressmanager" + "github.com/kaspanet/kaspad/network/connmanager" + "github.com/kaspanet/kaspad/network/netadapter" + "github.com/kaspanet/kaspad/network/protocol/flowcontext" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" "github.com/kaspanet/kaspad/util" ) diff --git a/protocol/peer/log.go b/network/protocol/peer/log.go similarity index 75% rename from protocol/peer/log.go rename to network/protocol/peer/log.go index c5ecb0769..70220a46b 100644 --- a/protocol/peer/log.go +++ b/network/protocol/peer/log.go @@ -1,7 +1,7 @@ package peer import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/protocol/peer/peer.go b/network/protocol/peer/peer.go similarity index 97% rename from protocol/peer/peer.go rename to network/protocol/peer/peer.go index 66d63874d..fcbaca67c 100644 --- a/protocol/peer/peer.go +++ b/network/protocol/peer/peer.go @@ -1,13 +1,13 @@ package peer import ( - "github.com/kaspanet/kaspad/netadapter" + "github.com/kaspanet/kaspad/network/netadapter" "sync" "sync/atomic" "time" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter/id" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter/id" "github.com/kaspanet/kaspad/util/daghash" mathUtil "github.com/kaspanet/kaspad/util/math" "github.com/kaspanet/kaspad/util/mstime" diff --git a/protocol/protocol.go b/network/protocol/protocol.go similarity index 92% rename from protocol/protocol.go rename to network/protocol/protocol.go index cbc2d0ea9..ad4ac393f 100644 --- a/protocol/protocol.go +++ b/network/protocol/protocol.go @@ -1,22 +1,22 @@ package protocol import ( - "github.com/kaspanet/kaspad/protocol/flows/rejects" + "github.com/kaspanet/kaspad/network/protocol/flows/rejects" "sync/atomic" - "github.com/kaspanet/kaspad/addressmanager" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/netadapter" - routerpkg "github.com/kaspanet/kaspad/netadapter/router" - "github.com/kaspanet/kaspad/protocol/flows/addressexchange" - "github.com/kaspanet/kaspad/protocol/flows/blockrelay" - "github.com/kaspanet/kaspad/protocol/flows/handshake" - "github.com/kaspanet/kaspad/protocol/flows/ibd" - "github.com/kaspanet/kaspad/protocol/flows/ibd/selectedtip" - "github.com/kaspanet/kaspad/protocol/flows/ping" - "github.com/kaspanet/kaspad/protocol/flows/relaytransactions" - peerpkg "github.com/kaspanet/kaspad/protocol/peer" - "github.com/kaspanet/kaspad/protocol/protocolerrors" + "github.com/kaspanet/kaspad/network/addressmanager" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/netadapter" + routerpkg "github.com/kaspanet/kaspad/network/netadapter/router" + "github.com/kaspanet/kaspad/network/protocol/flows/addressexchange" + "github.com/kaspanet/kaspad/network/protocol/flows/blockrelay" + "github.com/kaspanet/kaspad/network/protocol/flows/handshake" + "github.com/kaspanet/kaspad/network/protocol/flows/ibd" + "github.com/kaspanet/kaspad/network/protocol/flows/ibd/selectedtip" + "github.com/kaspanet/kaspad/network/protocol/flows/ping" + "github.com/kaspanet/kaspad/network/protocol/flows/relaytransactions" + peerpkg "github.com/kaspanet/kaspad/network/protocol/peer" + "github.com/kaspanet/kaspad/network/protocol/protocolerrors" "github.com/pkg/errors" ) diff --git a/protocol/protocolerrors/protocolerrors.go b/network/protocol/protocolerrors/protocolerrors.go similarity index 100% rename from protocol/protocolerrors/protocolerrors.go rename to network/protocol/protocolerrors/protocolerrors.go diff --git a/rpc/client/CONTRIBUTORS b/network/rpc/client/CONTRIBUTORS similarity index 100% rename from rpc/client/CONTRIBUTORS rename to network/rpc/client/CONTRIBUTORS diff --git a/rpc/client/README.md b/network/rpc/client/README.md similarity index 100% rename from rpc/client/README.md rename to network/rpc/client/README.md diff --git a/rpc/client/dag.go b/network/rpc/client/dag.go similarity index 99% rename from rpc/client/dag.go rename to network/rpc/client/dag.go index 72e2ff67d..064e29af4 100644 --- a/rpc/client/dag.go +++ b/network/rpc/client/dag.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/rpc/client/doc.go b/network/rpc/client/doc.go similarity index 100% rename from rpc/client/doc.go rename to network/rpc/client/doc.go diff --git a/rpc/client/examples/httppost/README.md b/network/rpc/client/examples/httppost/README.md similarity index 100% rename from rpc/client/examples/httppost/README.md rename to network/rpc/client/examples/httppost/README.md diff --git a/rpc/client/examples/httppost/main.go b/network/rpc/client/examples/httppost/main.go similarity index 94% rename from rpc/client/examples/httppost/main.go rename to network/rpc/client/examples/httppost/main.go index ee50e7ef2..c1d92e327 100644 --- a/rpc/client/examples/httppost/main.go +++ b/network/rpc/client/examples/httppost/main.go @@ -7,7 +7,7 @@ package main import ( "log" - "github.com/kaspanet/kaspad/rpc/client" + "github.com/kaspanet/kaspad/network/rpc/client" ) func main() { diff --git a/rpc/client/examples/websockets/README.md b/network/rpc/client/examples/websockets/README.md similarity index 100% rename from rpc/client/examples/websockets/README.md rename to network/rpc/client/examples/websockets/README.md diff --git a/rpc/client/examples/websockets/main.go b/network/rpc/client/examples/websockets/main.go similarity index 95% rename from rpc/client/examples/websockets/main.go rename to network/rpc/client/examples/websockets/main.go index 6b225bb77..a927ac163 100644 --- a/rpc/client/examples/websockets/main.go +++ b/network/rpc/client/examples/websockets/main.go @@ -10,8 +10,8 @@ import ( "path/filepath" "time" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/rpc/client" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/rpc/client" "github.com/kaspanet/kaspad/util" ) diff --git a/rpc/client/infrastructure.go b/network/rpc/client/infrastructure.go similarity index 99% rename from rpc/client/infrastructure.go rename to network/rpc/client/infrastructure.go index a23a7058e..0d1078f1a 100644 --- a/rpc/client/infrastructure.go +++ b/network/rpc/client/infrastructure.go @@ -26,7 +26,7 @@ import ( "github.com/btcsuite/go-socks/socks" "github.com/btcsuite/websocket" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) var ( diff --git a/rpc/client/log.go b/network/rpc/client/log.go similarity index 95% rename from rpc/client/log.go rename to network/rpc/client/log.go index f8a6d80a1..4687aa260 100644 --- a/rpc/client/log.go +++ b/network/rpc/client/log.go @@ -5,7 +5,7 @@ package client import ( - "github.com/kaspanet/kaspad/logs" + "github.com/kaspanet/kaspad/infrastructure/logs" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/rpc/client/mining.go b/network/rpc/client/mining.go similarity index 98% rename from rpc/client/mining.go rename to network/rpc/client/mining.go index 793cab76d..7d3f5cf7e 100644 --- a/rpc/client/mining.go +++ b/network/rpc/client/mining.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" diff --git a/rpc/client/net.go b/network/rpc/client/net.go similarity index 99% rename from rpc/client/net.go rename to network/rpc/client/net.go index 52544b81d..173edf22a 100644 --- a/rpc/client/net.go +++ b/network/rpc/client/net.go @@ -9,11 +9,11 @@ import ( "encoding/hex" "encoding/json" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/pointers" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // FutureAddNodeResult is a future promise to deliver the result of an diff --git a/rpc/client/notify.go b/network/rpc/client/notify.go similarity index 99% rename from rpc/client/notify.go rename to network/rpc/client/notify.go index aa86b5698..ba86e4d78 100644 --- a/rpc/client/notify.go +++ b/network/rpc/client/notify.go @@ -13,8 +13,8 @@ import ( "github.com/kaspanet/kaspad/util/mstime" "github.com/pkg/errors" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/rpc/client/rawrequest.go b/network/rpc/client/rawrequest.go similarity index 98% rename from rpc/client/rawrequest.go rename to network/rpc/client/rawrequest.go index 053196401..47ccff9cb 100644 --- a/rpc/client/rawrequest.go +++ b/network/rpc/client/rawrequest.go @@ -6,7 +6,7 @@ package client import ( "encoding/json" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/pkg/errors" ) diff --git a/rpc/client/rawtransactions.go b/network/rpc/client/rawtransactions.go similarity index 95% rename from rpc/client/rawtransactions.go rename to network/rpc/client/rawtransactions.go index e3e407964..86286cda4 100644 --- a/rpc/client/rawtransactions.go +++ b/network/rpc/client/rawtransactions.go @@ -8,8 +8,8 @@ import ( "bytes" "encoding/hex" "encoding/json" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/rpc/common.go b/network/rpc/common.go similarity index 98% rename from rpc/common.go rename to network/rpc/common.go index 48f8115e6..b0726b369 100644 --- a/rpc/common.go +++ b/network/rpc/common.go @@ -4,10 +4,10 @@ import ( "bytes" "encoding/hex" "fmt" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/rpc/model" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/pointers" diff --git a/rpc/handle_connect.go b/network/rpc/handle_connect.go similarity index 92% rename from rpc/handle_connect.go rename to network/rpc/handle_connect.go index c275ae105..6ec55f9d3 100644 --- a/rpc/handle_connect.go +++ b/network/rpc/handle_connect.go @@ -1,7 +1,7 @@ package rpc import ( - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/network" ) diff --git a/rpc/handle_debug_level.go b/network/rpc/handle_debug_level.go similarity index 85% rename from rpc/handle_debug_level.go rename to network/rpc/handle_debug_level.go index bd70352fd..e9f421d24 100644 --- a/rpc/handle_debug_level.go +++ b/network/rpc/handle_debug_level.go @@ -2,8 +2,8 @@ package rpc import ( "fmt" - "github.com/kaspanet/kaspad/logger" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/infrastructure/logger" + "github.com/kaspanet/kaspad/network/rpc/model" ) // handleDebugLevel handles debugLevel commands. diff --git a/rpc/handle_disconnect.go b/network/rpc/handle_disconnect.go similarity index 91% rename from rpc/handle_disconnect.go rename to network/rpc/handle_disconnect.go index 751cbb85d..d3c390c11 100644 --- a/rpc/handle_disconnect.go +++ b/network/rpc/handle_disconnect.go @@ -1,7 +1,7 @@ package rpc import ( - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/network" ) diff --git a/rpc/handle_get_block.go b/network/rpc/handle_get_block.go similarity index 98% rename from rpc/handle_get_block.go rename to network/rpc/handle_get_block.go index b23de9871..fb9e82df5 100644 --- a/rpc/handle_get_block.go +++ b/network/rpc/handle_get_block.go @@ -5,7 +5,7 @@ import ( "bytes" "encoding/hex" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/subnetworkid" diff --git a/rpc/handle_get_block_count.go b/network/rpc/handle_get_block_count.go similarity index 100% rename from rpc/handle_get_block_count.go rename to network/rpc/handle_get_block_count.go diff --git a/rpc/handle_get_block_dag_info.go b/network/rpc/handle_get_block_dag_info.go similarity index 94% rename from rpc/handle_get_block_dag_info.go rename to network/rpc/handle_get_block_dag_info.go index f64f296bb..ac8b138d5 100644 --- a/rpc/handle_get_block_dag_info.go +++ b/network/rpc/handle_get_block_dag_info.go @@ -1,7 +1,7 @@ package rpc import ( - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/rpc/handle_get_block_header.go b/network/rpc/handle_get_block_header.go similarity index 98% rename from rpc/handle_get_block_header.go rename to network/rpc/handle_get_block_header.go index 1ddc9fca5..fefc8d32e 100644 --- a/rpc/handle_get_block_header.go +++ b/network/rpc/handle_get_block_header.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/hex" "fmt" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/daghash" "strconv" ) diff --git a/rpc/handle_get_block_template.go b/network/rpc/handle_get_block_template.go similarity index 99% rename from rpc/handle_get_block_template.go rename to network/rpc/handle_get_block_template.go index 51b5240c1..e3d3c30ec 100644 --- a/rpc/handle_get_block_template.go +++ b/network/rpc/handle_get_block_template.go @@ -11,11 +11,11 @@ import ( "github.com/kaspanet/kaspad/util/mstime" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/mining" - "github.com/kaspanet/kaspad/rpc/model" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/mining" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/random" diff --git a/rpc/handle_get_blocks.go b/network/rpc/handle_get_blocks.go similarity index 98% rename from rpc/handle_get_blocks.go rename to network/rpc/handle_get_blocks.go index 08445e1e6..3a244c82a 100644 --- a/rpc/handle_get_blocks.go +++ b/network/rpc/handle_get_blocks.go @@ -2,7 +2,7 @@ package rpc import ( "encoding/hex" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/rpc/handle_get_chain_from_block.go b/network/rpc/handle_get_chain_from_block.go similarity index 98% rename from rpc/handle_get_chain_from_block.go rename to network/rpc/handle_get_chain_from_block.go index da34d95c1..ed5e1d618 100644 --- a/rpc/handle_get_chain_from_block.go +++ b/network/rpc/handle_get_chain_from_block.go @@ -2,7 +2,7 @@ package rpc import ( "fmt" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/rpc/handle_get_connected_peer_info.go b/network/rpc/handle_get_connected_peer_info.go similarity index 95% rename from rpc/handle_get_connected_peer_info.go rename to network/rpc/handle_get_connected_peer_info.go index be3cc8539..e9bd4b2f6 100644 --- a/rpc/handle_get_connected_peer_info.go +++ b/network/rpc/handle_get_connected_peer_info.go @@ -1,7 +1,7 @@ package rpc import ( - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // handleGetConnectedPeerInfo implements the getConnectedPeerInfo command. diff --git a/rpc/handle_get_connection_count.go b/network/rpc/handle_get_connection_count.go similarity index 100% rename from rpc/handle_get_connection_count.go rename to network/rpc/handle_get_connection_count.go diff --git a/rpc/handle_get_current_net.go b/network/rpc/handle_get_current_net.go similarity index 100% rename from rpc/handle_get_current_net.go rename to network/rpc/handle_get_current_net.go diff --git a/rpc/handle_get_difficulty.go b/network/rpc/handle_get_difficulty.go similarity index 100% rename from rpc/handle_get_difficulty.go rename to network/rpc/handle_get_difficulty.go diff --git a/rpc/handle_get_headers.go b/network/rpc/handle_get_headers.go similarity index 96% rename from rpc/handle_get_headers.go rename to network/rpc/handle_get_headers.go index 41818eb80..d69877ad2 100644 --- a/rpc/handle_get_headers.go +++ b/network/rpc/handle_get_headers.go @@ -3,7 +3,7 @@ package rpc import ( "bytes" "encoding/hex" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/rpc/handle_get_info.go b/network/rpc/handle_get_info.go similarity index 87% rename from rpc/handle_get_info.go rename to network/rpc/handle_get_info.go index 253425810..fd9064e85 100644 --- a/rpc/handle_get_info.go +++ b/network/rpc/handle_get_info.go @@ -1,8 +1,8 @@ package rpc import ( - "github.com/kaspanet/kaspad/rpc/model" - "github.com/kaspanet/kaspad/version" + "github.com/kaspanet/kaspad/infrastructure/version" + "github.com/kaspanet/kaspad/network/rpc/model" ) // handleGetInfo implements the getInfo command. We only return the fields diff --git a/rpc/handle_get_mempool_entry.go b/network/rpc/handle_get_mempool_entry.go similarity index 93% rename from rpc/handle_get_mempool_entry.go rename to network/rpc/handle_get_mempool_entry.go index d124ea02f..94beb5dce 100644 --- a/rpc/handle_get_mempool_entry.go +++ b/network/rpc/handle_get_mempool_entry.go @@ -1,7 +1,7 @@ package rpc import ( - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/daghash" "github.com/pkg/errors" ) diff --git a/rpc/handle_get_mempool_info.go b/network/rpc/handle_get_mempool_info.go similarity index 89% rename from rpc/handle_get_mempool_info.go rename to network/rpc/handle_get_mempool_info.go index ba58da2b2..7f5f3de77 100644 --- a/rpc/handle_get_mempool_info.go +++ b/network/rpc/handle_get_mempool_info.go @@ -1,6 +1,6 @@ package rpc -import "github.com/kaspanet/kaspad/rpc/model" +import "github.com/kaspanet/kaspad/network/rpc/model" // handleGetMempoolInfo implements the getMempoolInfo command. func handleGetMempoolInfo(s *Server, cmd interface{}, closeChan <-chan struct{}) (interface{}, error) { diff --git a/rpc/handle_get_peer_addresses.go b/network/rpc/handle_get_peer_addresses.go similarity index 95% rename from rpc/handle_get_peer_addresses.go rename to network/rpc/handle_get_peer_addresses.go index 5942bb0d6..f0a33639c 100644 --- a/rpc/handle_get_peer_addresses.go +++ b/network/rpc/handle_get_peer_addresses.go @@ -1,8 +1,8 @@ package rpc import ( - "github.com/kaspanet/kaspad/addressmanager" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/addressmanager" + "github.com/kaspanet/kaspad/network/rpc/model" ) // handleGetPeerAddresses handles getPeerAddresses commands. diff --git a/rpc/handle_get_raw_mempool.go b/network/rpc/handle_get_raw_mempool.go similarity index 97% rename from rpc/handle_get_raw_mempool.go rename to network/rpc/handle_get_raw_mempool.go index b5433f264..81dc39845 100644 --- a/rpc/handle_get_raw_mempool.go +++ b/network/rpc/handle_get_raw_mempool.go @@ -1,7 +1,7 @@ package rpc import ( - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" ) diff --git a/rpc/handle_get_selected_tip.go b/network/rpc/handle_get_selected_tip.go similarity index 95% rename from rpc/handle_get_selected_tip.go rename to network/rpc/handle_get_selected_tip.go index 4c28530a1..dc61f685e 100644 --- a/rpc/handle_get_selected_tip.go +++ b/network/rpc/handle_get_selected_tip.go @@ -2,7 +2,7 @@ package rpc import ( "encoding/hex" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // handleGetSelectedTip implements the getSelectedTip command. diff --git a/rpc/handle_get_selected_tip_hash.go b/network/rpc/handle_get_selected_tip_hash.go similarity index 100% rename from rpc/handle_get_selected_tip_hash.go rename to network/rpc/handle_get_selected_tip_hash.go diff --git a/rpc/handle_get_subnetwork.go b/network/rpc/handle_get_subnetwork.go similarity index 94% rename from rpc/handle_get_subnetwork.go rename to network/rpc/handle_get_subnetwork.go index 48170db47..dc8d88ffc 100644 --- a/rpc/handle_get_subnetwork.go +++ b/network/rpc/handle_get_subnetwork.go @@ -1,7 +1,7 @@ package rpc import ( - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/subnetworkid" ) diff --git a/rpc/handle_get_top_headers.go b/network/rpc/handle_get_top_headers.go similarity index 95% rename from rpc/handle_get_top_headers.go rename to network/rpc/handle_get_top_headers.go index d68a9e0d7..3a8f2774a 100644 --- a/rpc/handle_get_top_headers.go +++ b/network/rpc/handle_get_top_headers.go @@ -3,7 +3,7 @@ package rpc import ( "bytes" "encoding/hex" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/rpc/handle_get_tx_out.go b/network/rpc/handle_get_tx_out.go similarity index 96% rename from rpc/handle_get_tx_out.go rename to network/rpc/handle_get_tx_out.go index 29b560fdb..1b98410ff 100644 --- a/rpc/handle_get_tx_out.go +++ b/network/rpc/handle_get_tx_out.go @@ -4,9 +4,9 @@ import ( "encoding/hex" "fmt" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/rpc/model" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/pointers" diff --git a/rpc/handle_help.go b/network/rpc/handle_help.go similarity index 95% rename from rpc/handle_help.go rename to network/rpc/handle_help.go index 43efb7408..c244b6a47 100644 --- a/rpc/handle_help.go +++ b/network/rpc/handle_help.go @@ -1,6 +1,6 @@ package rpc -import "github.com/kaspanet/kaspad/rpc/model" +import "github.com/kaspanet/kaspad/network/rpc/model" // handleHelp implements the help command. func handleHelp(s *Server, cmd interface{}, closeChan <-chan struct{}) (interface{}, error) { diff --git a/rpc/handle_load_tx_filter.go b/network/rpc/handle_load_tx_filter.go similarity index 92% rename from rpc/handle_load_tx_filter.go rename to network/rpc/handle_load_tx_filter.go index ae711e3c4..7e793a851 100644 --- a/rpc/handle_load_tx_filter.go +++ b/network/rpc/handle_load_tx_filter.go @@ -1,8 +1,8 @@ package rpc import ( - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/rpc/handle_notify_blocks.go b/network/rpc/handle_notify_blocks.go similarity index 100% rename from rpc/handle_notify_blocks.go rename to network/rpc/handle_notify_blocks.go diff --git a/rpc/handle_notify_chain_changes.go b/network/rpc/handle_notify_chain_changes.go similarity index 90% rename from rpc/handle_notify_chain_changes.go rename to network/rpc/handle_notify_chain_changes.go index 1c175306f..78838603b 100644 --- a/rpc/handle_notify_chain_changes.go +++ b/network/rpc/handle_notify_chain_changes.go @@ -1,6 +1,6 @@ package rpc -import "github.com/kaspanet/kaspad/rpc/model" +import "github.com/kaspanet/kaspad/network/rpc/model" // handleNotifyChainChanges implements the notifyChainChanges command extension for // websocket connections. diff --git a/rpc/handle_notify_new_transactions.go b/network/rpc/handle_notify_new_transactions.go similarity index 97% rename from rpc/handle_notify_new_transactions.go rename to network/rpc/handle_notify_new_transactions.go index 270391750..67c015da6 100644 --- a/rpc/handle_notify_new_transactions.go +++ b/network/rpc/handle_notify_new_transactions.go @@ -1,7 +1,7 @@ package rpc import ( - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/subnetworkid" ) diff --git a/rpc/handle_rescan_block_filter.go b/network/rpc/handle_rescan_block_filter.go similarity index 91% rename from rpc/handle_rescan_block_filter.go rename to network/rpc/handle_rescan_block_filter.go index f093bf4ee..6211110ea 100644 --- a/rpc/handle_rescan_block_filter.go +++ b/network/rpc/handle_rescan_block_filter.go @@ -1,9 +1,9 @@ package rpc import ( - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" ) diff --git a/rpc/handle_rescan_blocks.go b/network/rpc/handle_rescan_blocks.go similarity index 97% rename from rpc/handle_rescan_blocks.go rename to network/rpc/handle_rescan_blocks.go index 89f69c8b5..3acf845ab 100644 --- a/rpc/handle_rescan_blocks.go +++ b/network/rpc/handle_rescan_blocks.go @@ -2,7 +2,7 @@ package rpc import ( "fmt" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/rpc/handle_send_raw_transaction.go b/network/rpc/handle_send_raw_transaction.go similarity index 88% rename from rpc/handle_send_raw_transaction.go rename to network/rpc/handle_send_raw_transaction.go index 0c250a29f..19a1778af 100644 --- a/rpc/handle_send_raw_transaction.go +++ b/network/rpc/handle_send_raw_transaction.go @@ -3,9 +3,9 @@ package rpc import ( "bytes" "encoding/hex" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/mempool" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/domain/mempool" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" "github.com/pkg/errors" ) diff --git a/rpc/handle_session.go b/network/rpc/handle_session.go similarity index 81% rename from rpc/handle_session.go rename to network/rpc/handle_session.go index 79b6b03ab..57a3280da 100644 --- a/rpc/handle_session.go +++ b/network/rpc/handle_session.go @@ -1,6 +1,6 @@ package rpc -import "github.com/kaspanet/kaspad/rpc/model" +import "github.com/kaspanet/kaspad/network/rpc/model" // handleSession implements the session command extension for websocket // connections. diff --git a/rpc/handle_stop.go b/network/rpc/handle_stop.go similarity index 100% rename from rpc/handle_stop.go rename to network/rpc/handle_stop.go diff --git a/rpc/handle_stop_notify_blocks.go b/network/rpc/handle_stop_notify_blocks.go similarity index 100% rename from rpc/handle_stop_notify_blocks.go rename to network/rpc/handle_stop_notify_blocks.go diff --git a/rpc/handle_stop_notify_chain_changes.go b/network/rpc/handle_stop_notify_chain_changes.go similarity index 100% rename from rpc/handle_stop_notify_chain_changes.go rename to network/rpc/handle_stop_notify_chain_changes.go diff --git a/rpc/handle_stop_notify_new_transactions.go b/network/rpc/handle_stop_notify_new_transactions.go similarity index 100% rename from rpc/handle_stop_notify_new_transactions.go rename to network/rpc/handle_stop_notify_new_transactions.go diff --git a/rpc/handle_submit_block.go b/network/rpc/handle_submit_block.go similarity index 91% rename from rpc/handle_submit_block.go rename to network/rpc/handle_submit_block.go index 1a61c6adb..2c46ca80b 100644 --- a/rpc/handle_submit_block.go +++ b/network/rpc/handle_submit_block.go @@ -3,8 +3,8 @@ package rpc import ( "encoding/hex" "fmt" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" ) diff --git a/rpc/handle_uptime.go b/network/rpc/handle_uptime.go similarity index 100% rename from rpc/handle_uptime.go rename to network/rpc/handle_uptime.go diff --git a/rpc/handle_version.go b/network/rpc/handle_version.go similarity index 91% rename from rpc/handle_version.go rename to network/rpc/handle_version.go index 18298a225..3d39b8d33 100644 --- a/rpc/handle_version.go +++ b/network/rpc/handle_version.go @@ -1,6 +1,6 @@ package rpc -import "github.com/kaspanet/kaspad/rpc/model" +import "github.com/kaspanet/kaspad/network/rpc/model" // API version constants const ( diff --git a/rpc/handle_websocket_help.go b/network/rpc/handle_websocket_help.go similarity index 96% rename from rpc/handle_websocket_help.go rename to network/rpc/handle_websocket_help.go index 50985fa5e..de7499fa7 100644 --- a/rpc/handle_websocket_help.go +++ b/network/rpc/handle_websocket_help.go @@ -1,6 +1,6 @@ package rpc -import "github.com/kaspanet/kaspad/rpc/model" +import "github.com/kaspanet/kaspad/network/rpc/model" // handleWebsocketHelp implements the help command for websocket connections. func handleWebsocketHelp(wsc *wsClient, icmd interface{}) (interface{}, error) { diff --git a/rpc/log.go b/network/rpc/log.go similarity index 85% rename from rpc/log.go rename to network/rpc/log.go index 0281c9a91..426e7121c 100644 --- a/rpc/log.go +++ b/network/rpc/log.go @@ -5,7 +5,7 @@ package rpc import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/rpc/model/CONTRIBUTORS b/network/rpc/model/CONTRIBUTORS similarity index 100% rename from rpc/model/CONTRIBUTORS rename to network/rpc/model/CONTRIBUTORS diff --git a/rpc/model/README.md b/network/rpc/model/README.md similarity index 100% rename from rpc/model/README.md rename to network/rpc/model/README.md diff --git a/rpc/model/command_info.go b/network/rpc/model/command_info.go similarity index 100% rename from rpc/model/command_info.go rename to network/rpc/model/command_info.go diff --git a/rpc/model/command_info_test.go b/network/rpc/model/command_info_test.go similarity index 99% rename from rpc/model/command_info_test.go rename to network/rpc/model/command_info_test.go index f5b6be937..0c101b381 100644 --- a/rpc/model/command_info_test.go +++ b/network/rpc/model/command_info_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // TestCommandMethod tests the CommandMethod function to ensure it retunrs the expected diff --git a/rpc/model/command_parse.go b/network/rpc/model/command_parse.go similarity index 100% rename from rpc/model/command_parse.go rename to network/rpc/model/command_parse.go diff --git a/rpc/model/command_parse_test.go b/network/rpc/model/command_parse_test.go similarity index 99% rename from rpc/model/command_parse_test.go rename to network/rpc/model/command_parse_test.go index 83732a47a..1b56de49f 100644 --- a/rpc/model/command_parse_test.go +++ b/network/rpc/model/command_parse_test.go @@ -11,7 +11,7 @@ import ( "reflect" "testing" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // TestAssignField tests the assignField function handles supported combinations diff --git a/rpc/model/doc.go b/network/rpc/model/doc.go similarity index 100% rename from rpc/model/doc.go rename to network/rpc/model/doc.go diff --git a/rpc/model/error.go b/network/rpc/model/error.go similarity index 100% rename from rpc/model/error.go rename to network/rpc/model/error.go diff --git a/rpc/model/error_test.go b/network/rpc/model/error_test.go similarity index 97% rename from rpc/model/error_test.go rename to network/rpc/model/error_test.go index d6a75381f..de8bf783a 100644 --- a/rpc/model/error_test.go +++ b/network/rpc/model/error_test.go @@ -7,7 +7,7 @@ package model_test import ( "testing" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // TestErrorCodeStringer tests the stringized output for the ErrorCode type. diff --git a/rpc/model/example_test.go b/network/rpc/model/example_test.go similarity index 99% rename from rpc/model/example_test.go rename to network/rpc/model/example_test.go index 02fe3759f..d2b0f4cb8 100644 --- a/rpc/model/example_test.go +++ b/network/rpc/model/example_test.go @@ -9,7 +9,7 @@ import ( "fmt" "github.com/kaspanet/kaspad/util/pointers" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // This example demonstrates how to create and marshal a command into a JSON-RPC diff --git a/rpc/model/export_test.go b/network/rpc/model/export_test.go similarity index 100% rename from rpc/model/export_test.go rename to network/rpc/model/export_test.go diff --git a/rpc/model/help.go b/network/rpc/model/help.go similarity index 100% rename from rpc/model/help.go rename to network/rpc/model/help.go diff --git a/rpc/model/help_test.go b/network/rpc/model/help_test.go similarity index 99% rename from rpc/model/help_test.go rename to network/rpc/model/help_test.go index a5c4b42c7..1a6deb279 100644 --- a/rpc/model/help_test.go +++ b/network/rpc/model/help_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // TestHelpReflectInternals ensures the various help functions which deal with diff --git a/rpc/model/jsonrpc.go b/network/rpc/model/jsonrpc.go similarity index 100% rename from rpc/model/jsonrpc.go rename to network/rpc/model/jsonrpc.go diff --git a/rpc/model/jsonrpc_errors.go b/network/rpc/model/jsonrpc_errors.go similarity index 100% rename from rpc/model/jsonrpc_errors.go rename to network/rpc/model/jsonrpc_errors.go diff --git a/rpc/model/jsonrpc_test.go b/network/rpc/model/jsonrpc_test.go similarity index 98% rename from rpc/model/jsonrpc_test.go rename to network/rpc/model/jsonrpc_test.go index 2891f186a..f374d9d71 100644 --- a/rpc/model/jsonrpc_test.go +++ b/network/rpc/model/jsonrpc_test.go @@ -10,7 +10,7 @@ import ( "reflect" "testing" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // TestIsValidIDType ensures the IsValidIDType function behaves as expected. diff --git a/rpc/model/register.go b/network/rpc/model/register.go similarity index 100% rename from rpc/model/register.go rename to network/rpc/model/register.go diff --git a/rpc/model/register_test.go b/network/rpc/model/register_test.go similarity index 99% rename from rpc/model/register_test.go rename to network/rpc/model/register_test.go index 1fb79f169..0072f2639 100644 --- a/rpc/model/register_test.go +++ b/network/rpc/model/register_test.go @@ -10,7 +10,7 @@ import ( "sort" "testing" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // TestUsageFlagStringer tests the stringized output for the UsageFlag type. diff --git a/rpc/model/rpc_commands.go b/network/rpc/model/rpc_commands.go similarity index 100% rename from rpc/model/rpc_commands.go rename to network/rpc/model/rpc_commands.go diff --git a/rpc/model/rpc_commands_test.go b/network/rpc/model/rpc_commands_test.go similarity index 99% rename from rpc/model/rpc_commands_test.go rename to network/rpc/model/rpc_commands_test.go index 3c52e21a5..83b49521c 100644 --- a/rpc/model/rpc_commands_test.go +++ b/network/rpc/model/rpc_commands_test.go @@ -13,7 +13,7 @@ import ( "reflect" "testing" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // TestRPCServerCommands tests all of the kaspa rpc server commands marshal and unmarshal diff --git a/rpc/model/rpc_results.go b/network/rpc/model/rpc_results.go similarity index 99% rename from rpc/model/rpc_results.go rename to network/rpc/model/rpc_results.go index ff9ccdb9e..4d3d5ccde 100644 --- a/rpc/model/rpc_results.go +++ b/network/rpc/model/rpc_results.go @@ -6,7 +6,7 @@ package model import ( "encoding/json" - "github.com/kaspanet/kaspad/addressmanager" + "github.com/kaspanet/kaspad/network/addressmanager" ) // GetBlockHeaderVerboseResult models the data from the getblockheader command when diff --git a/rpc/model/rpc_results_test.go b/network/rpc/model/rpc_results_test.go similarity index 97% rename from rpc/model/rpc_results_test.go rename to network/rpc/model/rpc_results_test.go index 478c8495a..ee18b9f83 100644 --- a/rpc/model/rpc_results_test.go +++ b/network/rpc/model/rpc_results_test.go @@ -9,7 +9,7 @@ import ( "github.com/kaspanet/kaspad/util/pointers" "testing" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // TestRPCServerCustomResults ensures any results that have custom marshalling diff --git a/rpc/model/rpc_websocket_commands.go b/network/rpc/model/rpc_websocket_commands.go similarity index 100% rename from rpc/model/rpc_websocket_commands.go rename to network/rpc/model/rpc_websocket_commands.go diff --git a/rpc/model/rpc_websocket_commands_test.go b/network/rpc/model/rpc_websocket_commands_test.go similarity index 99% rename from rpc/model/rpc_websocket_commands_test.go rename to network/rpc/model/rpc_websocket_commands_test.go index 3288e38be..17d381db5 100644 --- a/rpc/model/rpc_websocket_commands_test.go +++ b/network/rpc/model/rpc_websocket_commands_test.go @@ -13,7 +13,7 @@ import ( "reflect" "testing" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // TestRPCServerWebsocketCommands tests all of the kaspa rpc server websocket-specific commands diff --git a/rpc/model/rpc_websocket_notifications.go b/network/rpc/model/rpc_websocket_notifications.go similarity index 100% rename from rpc/model/rpc_websocket_notifications.go rename to network/rpc/model/rpc_websocket_notifications.go diff --git a/rpc/model/rpc_websocket_notifications_test.go b/network/rpc/model/rpc_websocket_notifications_test.go similarity index 99% rename from rpc/model/rpc_websocket_notifications_test.go rename to network/rpc/model/rpc_websocket_notifications_test.go index e39ab04af..7e601fd02 100644 --- a/rpc/model/rpc_websocket_notifications_test.go +++ b/network/rpc/model/rpc_websocket_notifications_test.go @@ -14,7 +14,7 @@ import ( "github.com/kaspanet/kaspad/util/subnetworkid" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/rpc/model/rpc_websocket_results.go b/network/rpc/model/rpc_websocket_results.go similarity index 100% rename from rpc/model/rpc_websocket_results.go rename to network/rpc/model/rpc_websocket_results.go diff --git a/rpc/model/rpc_websocket_results_test.go b/network/rpc/model/rpc_websocket_results_test.go similarity index 95% rename from rpc/model/rpc_websocket_results_test.go rename to network/rpc/model/rpc_websocket_results_test.go index 7ce516e1c..99078e469 100644 --- a/rpc/model/rpc_websocket_results_test.go +++ b/network/rpc/model/rpc_websocket_results_test.go @@ -9,7 +9,7 @@ import ( "encoding/json" "testing" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" ) // TestRPCServerWebsocketResults ensures any results that have custom marshalling diff --git a/rpc/rpcserver.go b/network/rpc/rpcserver.go similarity index 98% rename from rpc/rpcserver.go rename to network/rpc/rpcserver.go index b938067aa..0a2994323 100644 --- a/rpc/rpcserver.go +++ b/network/rpc/rpcserver.go @@ -22,20 +22,20 @@ import ( "sync/atomic" "time" - "github.com/kaspanet/kaspad/addressmanager" - "github.com/kaspanet/kaspad/connmanager" - "github.com/kaspanet/kaspad/protocol" + "github.com/kaspanet/kaspad/network/addressmanager" + "github.com/kaspanet/kaspad/network/connmanager" + "github.com/kaspanet/kaspad/network/protocol" "github.com/kaspanet/kaspad/util/mstime" "github.com/pkg/errors" "github.com/btcsuite/websocket" - "github.com/kaspanet/kaspad/blockdag" - "github.com/kaspanet/kaspad/blockdag/indexers" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/mempool" - "github.com/kaspanet/kaspad/mining" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/domain/blockdag" + "github.com/kaspanet/kaspad/domain/blockdag/indexers" + "github.com/kaspanet/kaspad/domain/mempool" + "github.com/kaspanet/kaspad/domain/mining" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util/fs" "github.com/kaspanet/kaspad/util/network" ) diff --git a/rpc/rpcserverhelp.go b/network/rpc/rpcserverhelp.go similarity index 99% rename from rpc/rpcserverhelp.go rename to network/rpc/rpcserverhelp.go index eef01a306..4c1a0e870 100644 --- a/rpc/rpcserverhelp.go +++ b/network/rpc/rpcserverhelp.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/kaspanet/kaspad/rpc/model" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/pkg/errors" ) diff --git a/rpc/rpcserverhelp_test.go b/network/rpc/rpcserverhelp_test.go similarity index 100% rename from rpc/rpcserverhelp_test.go rename to network/rpc/rpcserverhelp_test.go diff --git a/rpc/rpcwebsocket.go b/network/rpc/rpcwebsocket.go similarity index 99% rename from rpc/rpcwebsocket.go rename to network/rpc/rpcwebsocket.go index 03bd70700..770739960 100644 --- a/rpc/rpcwebsocket.go +++ b/network/rpc/rpcwebsocket.go @@ -25,10 +25,10 @@ import ( "golang.org/x/crypto/ripemd160" "github.com/btcsuite/websocket" - "github.com/kaspanet/kaspad/dagconfig" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/rpc/model" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" + "github.com/kaspanet/kaspad/network/rpc/model" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/rpc/utils.go b/network/rpc/utils.go similarity index 95% rename from rpc/utils.go rename to network/rpc/utils.go index db8180e38..45dd2a4e4 100644 --- a/rpc/utils.go +++ b/network/rpc/utils.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/kaspanet/kaspad/config" + "github.com/kaspanet/kaspad/infrastructure/config" "github.com/kaspanet/kaspad/util" ) diff --git a/release/GIT-GPG-KEY-conformal.txt b/release/GIT-GPG-KEY-conformal.txt deleted file mode 100644 index a6d1a2562..000000000 --- a/release/GIT-GPG-KEY-conformal.txt +++ /dev/null @@ -1,74 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -mQINBFGJW70BEAC6cmsUVSeaaOTUfiWl8ngiI65ryOYZUCBwXGftTh4KvIuYguU1 -y9aws3ppH80D9+EzlpZbx7lNqGG85LiBd27yqgDbayYStz0e/R3vsYOMSt63rfxe -GsOc3yFxmPcYjjyJQDIbhGf0T04cf98+Mtdr6zz88MP0eHABQGmwcc7C/en3MC/B -Wwu/uKZOmv7I6fgGKOJFjXPqHNggnah+XWEBZEg1eCkMktmZrswGpJP4wjOCxatj -Dg30jt0gvfmFdB9bjJdBoikRKwUUPFMYhMjo2vheSwbobwjeOjzgLx9y1Xl1x7J4 -ZgBfm+MoShNyEN66eSTX8TLmcsD62RzA+UDpGF7TvyOrTZpnhSYM2VbwOpl0yxdv -WN3cot4qnnYVRN1FCz5pVdwpBWXhflGKCVLYyRnMCFLFiehyL8P5iMIuipu3SGlm -ECCLWNsoPISjG09eWj7XlD2T/xEMRcQ8G2sMTKjnafzmuGcbABKDemREFknbYCYB -nAhuCJKd4hlet8Qt+bR2GJWRlW2xKRO9eAGAwd1027W8EKr2tOg6bW6EADRkcbjs -NIXfxIYlDsP17YV0gtuYCGalaDixyHGE/i9b1j457Tkhw82sJrsIzv0GxyPI56iH -r2M72C+jEPS+jSqZvqyiwgFz/2xLvz80qf++10lXJJ5M0zA9oxfHRcxLvQARAQAB -tC9Db25mb3JtYWwgU3lzdGVtcywgTExDLiA8cmVsZWFzZUBjb25mb3JtYWwuY29t -PokCOAQTAQIAIgUCUYlbvQIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ -3+Onzh1FhSS++Q/9F+L6VfES9zd2IM6RUhQ/c0VtnB5kIpZNr067BR03gBrUNJAJ -fqMXzTD2yJ2jWNdJOkSGi/vlG0Q/arB58GC+sOEU9dba2aFej0Io7mQiHsElu+Xp -PvswckQBnkju6eowH7KxrbI9xGyqpa4b7IqhUJdDx8EUA2PHEJsVBHdSRwweZMpj -BNnqOnD+zr1agBMYPV/wKCfy+ohqjkmLyIba+tR1cG8hFEyKhXQzcFb4chBPmMcM -ryXQlR9d6dVzP9ZTZnb4kqckUm3LGWgAX/NW8UWxTYoqfw+YTxoZHm6NvCQCNYxz -bqGry8Fo9guPuO6vLxNZ7J4wTJWKaBewQIIaSMgKpoL5tF2apKkSB8CaSGhZiUyc -Q9+Vc68TcJZQMEYF856OiK/PqrhFyfdXgFkLnScMlWjSixcBDkqHwCGj4fr3yX6H -mEiHDK/DUcOlb5HUXwvEnJXCu5j0UIuMxUD6mb3MnfGUT/ttBHPM9fZ1OOmZHiGu -v58vIYuLcrTZ/6n7ObEWMzznJ4PxdyA3DGlmIfBnoXprrr8HDDCkI/SDAojIr9zu -+mJ9fHppaW8+iV8rHq5Rn1TyZgJ+pS/GOAd7gwJLAl3gifjTpbq1jyQATYqoCpp2 -I3Z51+eDhld+l9QVR2BchhTMJPkK1LpkIK3Pr0MEQAVf7AQwxrQavd9mB+WJAhwE -EAECAAYFAlHKEO0ACgkQs1UFMZPOvcmtZxAAoZmrxxkpugd72TZZfFbNRYGFfvMs -P3s4DJYOTtL12asXqfxwd5lAxYWJhHkqkc7Y8n7+byC+gBQNVEBWnEf1yv35JjYs -NCrDquRg2lK8S5meQGxLTEH0BoXmzQqe4PDLA1kUkY9otcHWbBq9oxORwZKcHBEw -mW7zfAMOP9dxoDJ809KJ4WGwy9djDJsywFNYOlTQkMd2JbzfHhj2bZ2w9Zx43mE7 -rj/QLcJGgpi57FiXJNZMVXuGWVO5GPWJMPXzH2d8cH9IUmTpGBTrhvMq5sotEepd -mXNmMUa2DNnhiDiF9GH2d66NX1cyHLG58/zI52n1Zxs7QJk9W2uYZV0rAuClxyRe -njxVK7G+ybvpA8IWdaDaif1XzUJAj8SniaydYwO4vzA9ht2efn6vzfF2F1n567/m -a2AI3k22dkT91fQo0L90r1UFaeu9adZ6rruMNVxMwG99TrRxbSdJqxttL5XHeIYj -f4W/5EjABB/gthb1GBDXaX+1jxijSuVOGjfVYPFoX+Z5NYPMZnk0N4k6VfR6Kg1U -qRRwxZlu1+2hTFK6A1HUOyFbubV9fYtaPFUdjgIXKa3lXtgR47zVRfymDlFKzLp2 -8MhnF3YfvlTdE5MkDr6e4TGCbfmdXSSs+IMxiH+GEBu+wr1Ip7+MaL8ce/98KcZQ -NtWScrZIA8qhTjyJAhwEEAECAAYFAlHOV8QACgkQA1L7cyui5DNitxAAjctA9/x2 -zGJ3spSyw9GEao5D/zU55eDt8mmrLLrLs9zcqf61apNH75V7DJKxvc+V4yiwI09O -uzHrsau33VgekHj9uVd+iuHgxheudwPanKDRBo/DXO0q0aN3KFLXptwz0ixiZ6RL -Gf4cfhtQtPhtdjK8aW6mAG+PLvOxNTSWz5pYx1k29xehaLU0zPF6YaAH5HtNgFFs -VQK5h7WO2hhs1QevuitK5RBKEjUAhHtl8iVwR81RCvzl9z5pDydkz8pTtpXzIYgf -ap6ZkiIr10DnXVjx2S5WlQq5mYGbyuUnqMwmetzQsVQipF1RX9zYKN18noFNigYy -1NbVf3+h49uQ2dIenT9xILewAiimEUzwDmgS7mUcBLwWnmjz9ZFJTWKpKWe5xzoR -XkZPaWD7J93RvQ4qsuCDHZv99H4ykfKosZ2P9CQn7HOL52DEMhwc9pZza9irz5Hv -fXGWsm5bn8NbJUN73HATpGTn/QClTBa28VZozcACuWqQre662P1/zR8BsDoeUydr -1rUaKyi6ynGhjMfcGxHw1GGThxo/bd05+EzouP8zX/+2sJn5pSeDP/Ovigfh8LZR -QEZx79/7p9kiDEymcRv8uLcJsC/iSI58S0o/m1g26ZQOiFH/C47/USEZ6bKQNgvD -MAimTmvfuMR7hkQ/dA/EW7AOzcBgCPTmOfa5Ag0EUYlbvQEQAKcWaFG7y6UjX93J -b8jxmrruMzj14qPw88QGRAmtFJzbeICiYG1gmgRq0dyAdfLst2vFjpZryKXhxxr2 -pM5IxCuxC+qaBe4oMAv/C/8B3ZANaUR3V1C0xNHunN9VWxf1XV682HXPnHUClkmG -+HjSW7PYsnCV7N1DrIDNSD5tp+Xai3cRzpvPA6QWL/amKAIqWgBlvfAft7yXPaKo -X8Z8WgXuz2deu9JhwSg9w8SNXyf4ZfcXhvN+HcdA9SaGnirmjxBdp/73/05qc8MI -5KOfWPA9e/hza2/HGsdnyt2rXrDgkTmkZM4bc845dWNK6cnwcrXD6ibH6f4eOxup -5gvpUIDKJTaeQY1qLZPGbPatpdl8EbYqu+Hc65M8N13OPgoKMcv1R9NbfMursQKt -6cS7liOG1Xjc12Chx8btpOhNZUkOnEnFNAxpaJbJSHL3O3KuCffsKrxnlQUQq8ZC -Tjlh/O1JmJR1tvz5nJA+zr02RyaxBYCi5QTvvPyGDS2Gn4JgiJXsXAMXHaDat42h -qdcjENwIw2Q55kgDrLIQDMKrUwdDz5p74gyoRKaSUnh+kpyGNZqbktIpIhJN9LpR -10QvDou4hwcnqM3BxrPmgT1jjNGoLtZriqtQ0yGuNUeicbIpgvtF/a93gWzF+kF7 -IRjLEsCDJHf064VFPHZUZ4UjXdWpABEBAAGJAh8EGAECAAkFAlGJW70CGwwACgkQ -3+Onzh1FhSROzw//VI/a5ACU4zgmJ+GFaQsq87HCmTOWD0Q8mf4GOzwBsH60klgB -kFwoGjfJK7dZiQFwdTts9C6Uiu88TSs11Ald1Ut0SmzaOcIEYj9IF7Suy8CGkd1f -SdpG0bqwAddWoncTfajwUrKcWlyJIUsoEv2/kow+IcMZ609pY2oxVLSv/5wUoISs -i2aCU+FDlAYVdsU6jMeRnMLbxlZ6NzKBROkjI61hIdpgZFRpaHk4GXsnyKybfBur -pXxrzsy+9AK+EddXuqSClwKwBE1YIeqOVldygafcwwaD0WSyV9HUHZUaNUU3jhlo -KuKwzRocKkuHTKBAn9hjCvpaReIc0fL9gP9SSJPt45m2pnTom1baCqadgAOr8D2n -H2zNUBTMhF6L/w1ubMHMXaApbc6Pt0eCSoOx3UALf2DRHKXQgVrSzw1fqnkYLWxH -eUuBBHIJqVjVAG3j/0AcvaFztSamMFceUtYFTnpo76wqh6z/RoBR6wC0CdjEvAes -IoQscRs7ya73cuckD7Jo3G7OrnA4/tNrG87GehwfdSOhfpXy4qH21ovho+I2y4FH -k3XVKrFgnT/g3Q1sU7GR+V/gO14nR7gbpo3LSodN0FVUTsp7kc9FZJvoUzIufwp5 -Te0Hxo1+FIse88qDcwdj5VxIDF5rIWHqdbRmoLaT0FFfckCo99R6a0n0Q9w= -=iic8 ------END PGP PUBLIC KEY BLOCK----- diff --git a/release/notes.sample b/release/notes.sample deleted file mode 100644 index 86a79a61f..000000000 --- a/release/notes.sample +++ /dev/null @@ -1,6 +0,0 @@ -- Each release note is preceded by a dash -- Each release note must not exceed 74 characters per line -- Release notes that require a longer explanation than will fit on a - single line should be wrapped with the text indented as in this line -- No periods at the end of each release note -- Other minor cleanup and bug fixes diff --git a/release/prep_release.sh b/release/prep_release.sh deleted file mode 100644 index 7d71ce431..000000000 --- a/release/prep_release.sh +++ /dev/null @@ -1,205 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2013 Conformal Systems LLC -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# -# -# Prepares for a release: -# - Bumps version according to specified level (major, minor, or patch) -# - Updates all version files and package control files with new version -# - Performs some basic validation on specified release notes -# - Updates project changes file with release notes -# - -PROJECT=kaspad -PROJECT_UC=$(echo $PROJECT | tr '[:lower:]' '[:upper:]') -SCRIPT=$(basename $0) -VERFILE=../version.go -VERFILES="$VERFILE ../cmd/kaspactl/version.go" -PROJ_CHANGES=../CHANGES - -# verify params -if [ $# -lt 2 ]; then - echo "usage: $SCRIPT {major | minor | patch} release-notes-file" - exit 1 -fi - -CUR_DIR=$(pwd) -cd "$(dirname $0)" - -# verify version files exist -for verfile in $VERFILES; do - if [ ! -f "$verfile" ]; then - echo "$SCRIPT: error: $verfile does not exist" 1>&2 - exit 1 - fi -done - -# verify changes file exists -if [ ! -f "$PROJ_CHANGES" ]; then - echo "$SCRIPT: error: $PROJ_CHANGES does not exist" 1>&2 - exit 1 -fi - -RTYPE="$1" -RELEASE_NOTES="$2" -if [ $(echo $RELEASE_NOTES | cut -c1) != "/" ]; then - RELEASE_NOTES="$CUR_DIR/$RELEASE_NOTES" -fi - -# verify valid release type -if [ "$RTYPE" != "major" -a "$RTYPE" != "minor" -a "$RTYPE" != "patch" ]; then - echo "$SCRIPT: error: release type must be major, minor, or patch" - exit 1 -fi - -# verify release notes -if [ ! -e "$RELEASE_NOTES" ]; then - echo "$SCRIPT: error: specified release notes file does not exist" - exit 1 -fi - -if [ ! -s "$RELEASE_NOTES" ]; then - echo "$SCRIPT: error: specified release notes file is empty" - exit 1 -fi - -# verify release notes format -while IFS='' read line; do - if [ -z "$line" ]; then - echo "$SCRIPT: error: release notes must not have blank lines" - exit 1 - fi - if [ ${#line} -gt 74 ]; then - echo -n "$SCRIPT: error: release notes must not contain lines " - echo "with more than 74 characters" - exit 1 - fi - if expr "$line" : ".*\.$" >/dev/null 2>&1 ; then - echo -n "$SCRIPT: error: release notes must not contain lines " - echo "that end in a period" - exit 1 - fi - if ! expr "$line" : "\-" >/dev/null 2>&1; then - if ! expr "$line" : " " >/dev/null 2>&1; then - echo -n "$SCRIPT: error: release notes must not contain lines " - echo "that do not begin with a dash and are not indented" - exit 1 - fi - fi -done <"$RELEASE_NOTES" - -# verify git is available -if ! type git >/dev/null 2>&1; then - echo -n "$SCRIPT: error: Unable to find 'git' in the system path." - exit 1 -fi - -# verify the git repository is on the master branch -BRANCH=$(git branch | grep '\*' | cut -c3-) -if [ "$BRANCH" != "master" ]; then - echo "$SCRIPT: error: git repository must be on the master branch." - exit 1 -fi - -# verify there are no uncommitted modifications prior to release modifications -NUM_MODIFIED=$(git diff 2>/dev/null | wc -l | sed 's/^[ \t]*//') -NUM_STAGED=$(git diff --cached 2>/dev/null | wc -l | sed 's/^[ \t]*//') -if [ "$NUM_MODIFIED" != "0" -o "$NUM_STAGED" != "0" ]; then - echo -n "$SCRIPT: error: the working directory contains uncommitted " - echo "modifications" - exit 1 -fi - -# get version -PAT_PREFIX="(^[[:space:]]+app" -PAT_SUFFIX='[[:space:]]+uint[[:space:]]+=[[:space:]]+)[0-9]+$' -MAJOR=$(egrep "${PAT_PREFIX}Major${PAT_SUFFIX}" $VERFILE | awk '{print $4}') -MINOR=$(egrep "${PAT_PREFIX}Minor${PAT_SUFFIX}" $VERFILE | awk '{print $4}') -PATCH=$(egrep "${PAT_PREFIX}Patch${PAT_SUFFIX}" $VERFILE | awk '{print $4}') -if [ -z "$MAJOR" -o -z "$MINOR" -o -z "$PATCH" ]; then - echo "$SCRIPT: error: unable to get version from $VERFILE" 1>&2 - exit 1 -fi - -# bump version according to level -if [ "$RTYPE" = "major" ]; then - MAJOR=$(expr $MAJOR + 1) - MINOR=0 - PATCH=0 -elif [ "$RTYPE" = "minor" ]; then - MINOR=$(expr $MINOR + 1) - PATCH=0 -elif [ "$RTYPE" = "patch" ]; then - PATCH=$(expr $PATCH + 1) -fi -PROJ_VER="$MAJOR.$MINOR.$PATCH" - -# update project changes with release notes -DATE=$(date "+%a %b %d %Y") -awk -v D="$DATE" -v VER="$PROJ_VER" ' -/=======/ && first_line==0 { - first_line=1 - print $0 - next -} -/=======/ && first_line==1 { - print $0 - print "" - print "Changes in "VER" ("D")" - exit -} -{ print $0 } -' <"$PROJ_CHANGES" >"${PROJ_CHANGES}.tmp" -cat "$RELEASE_NOTES" | sed 's/^/ /' >>"${PROJ_CHANGES}.tmp" -awk ' -/=======/ && first_line==0 { - first_line=1 - next -} -/=======/ && first_line==1 { - second_line=1 - next -} -second_line==1 { print $0 } -' <"$PROJ_CHANGES" >>"${PROJ_CHANGES}.tmp" - -# update version filef with new version -for verfile in $VERFILES; do - sed -E " - s/${PAT_PREFIX}Major${PAT_SUFFIX}/\1${MAJOR}/; - s/${PAT_PREFIX}Minor${PAT_SUFFIX}/\1${MINOR}/; - s/${PAT_PREFIX}Patch${PAT_SUFFIX}/\1${PATCH}/; - " <"$verfile" >"${verfile}.tmp" -done - - -# Apply changes -mv "${PROJ_CHANGES}.tmp" "$PROJ_CHANGES" -for verfile in $VERFILES; do - mv "${verfile}.tmp" "$verfile" -done - -echo "All files have been prepared for release." -echo "Use the following commands to review the changes for accuracy:" -echo " git status" -echo " git diff" -echo "" -echo "If everything is accurate, use the following commands to commit, tag," -echo "and push the changes" -echo " git commit -am \"Prepare for release ${PROJ_VER}.\"" -echo -n " git tag -a \"${PROJECT_UC}_${MAJOR}_${MINOR}_${PATCH}\" -m " -echo "\"Release ${PROJ_VER}\"" -echo " git push" -echo " git push --tags" diff --git a/service_windows.go b/service_windows.go index d4fbf5fff..a7fe7ef6c 100644 --- a/service_windows.go +++ b/service_windows.go @@ -15,9 +15,9 @@ import ( "github.com/btcsuite/winsvc/eventlog" "github.com/btcsuite/winsvc/mgr" "github.com/btcsuite/winsvc/svc" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/signal" - "github.com/kaspanet/kaspad/version" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/infrastructure/signal" + "github.com/kaspanet/kaspad/infrastructure/version" ) const ( diff --git a/integration/64_incoming_connections_test.go b/testing/integration/64_incoming_connections_test.go similarity index 96% rename from integration/64_incoming_connections_test.go rename to testing/integration/64_incoming_connections_test.go index 1f10cb81e..d9fa40cab 100644 --- a/integration/64_incoming_connections_test.go +++ b/testing/integration/64_incoming_connections_test.go @@ -8,7 +8,7 @@ import ( "github.com/kaspanet/kaspad/util/locks" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" ) func Test64IncomingConnections(t *testing.T) { diff --git a/integration/address_exchange_test.go b/testing/integration/address_exchange_test.go similarity index 100% rename from integration/address_exchange_test.go rename to testing/integration/address_exchange_test.go diff --git a/integration/basic_sync_test.go b/testing/integration/basic_sync_test.go similarity index 96% rename from integration/basic_sync_test.go rename to testing/integration/basic_sync_test.go index a28b0514b..090be8936 100644 --- a/integration/basic_sync_test.go +++ b/testing/integration/basic_sync_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" ) func TestIntegrationBasicSync(t *testing.T) { diff --git a/integration/config_test.go b/testing/integration/config_test.go similarity index 94% rename from integration/config_test.go rename to testing/integration/config_test.go index 04d5f4e5d..3e0ac1e1a 100644 --- a/integration/config_test.go +++ b/testing/integration/config_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/infrastructure/config" ) const ( diff --git a/integration/connect_test.go b/testing/integration/connect_test.go similarity index 100% rename from integration/connect_test.go rename to testing/integration/connect_test.go diff --git a/integration/ibd_test.go b/testing/integration/ibd_test.go similarity index 95% rename from integration/ibd_test.go rename to testing/integration/ibd_test.go index 3eecdd58a..0284ea324 100644 --- a/integration/ibd_test.go +++ b/testing/integration/ibd_test.go @@ -7,7 +7,7 @@ import ( "github.com/kaspanet/kaspad/util/locks" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" ) func TestIBD(t *testing.T) { diff --git a/integration/log_test.go b/testing/integration/log_test.go similarity index 87% rename from integration/log_test.go rename to testing/integration/log_test.go index 42f3f7717..d0b28f9d7 100644 --- a/integration/log_test.go +++ b/testing/integration/log_test.go @@ -6,7 +6,7 @@ package integration import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/integration/main_test.go b/testing/integration/main_test.go similarity index 71% rename from integration/main_test.go rename to testing/integration/main_test.go index f11216328..1b474c634 100644 --- a/integration/main_test.go +++ b/testing/integration/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" ) func TestMain(m *testing.M) { diff --git a/integration/mining_test.go b/testing/integration/mining_test.go similarity index 90% rename from integration/mining_test.go rename to testing/integration/mining_test.go index e4d25acb4..e37e030a1 100644 --- a/integration/mining_test.go +++ b/testing/integration/mining_test.go @@ -4,9 +4,9 @@ import ( "math/rand" "testing" - clientpkg "github.com/kaspanet/kaspad/rpc/client" + clientpkg "github.com/kaspanet/kaspad/network/rpc/client" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/integration/notifications_test.go b/testing/integration/notifications_test.go similarity index 85% rename from integration/notifications_test.go rename to testing/integration/notifications_test.go index 87f8a6c8d..15eb51f51 100644 --- a/integration/notifications_test.go +++ b/testing/integration/notifications_test.go @@ -3,7 +3,7 @@ package integration import ( "testing" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" ) func setOnBlockAddedHandler(t *testing.T, harness *appHarness, handler func(header *domainmessage.BlockHeader)) { diff --git a/integration/rpc_test.go b/testing/integration/rpc_test.go similarity index 87% rename from integration/rpc_test.go rename to testing/integration/rpc_test.go index 1d633dd2a..53d419526 100644 --- a/integration/rpc_test.go +++ b/testing/integration/rpc_test.go @@ -1,10 +1,10 @@ package integration import ( - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" - rpcclient "github.com/kaspanet/kaspad/rpc/client" + rpcclient "github.com/kaspanet/kaspad/network/rpc/client" ) type rpcClient struct { diff --git a/integration/setup_test.go b/testing/integration/setup_test.go similarity index 97% rename from integration/setup_test.go rename to testing/integration/setup_test.go index 7f594d363..9b7b6a1fd 100644 --- a/integration/setup_test.go +++ b/testing/integration/setup_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/kaspanet/kaspad/app" - "github.com/kaspanet/kaspad/config" - "github.com/kaspanet/kaspad/dbaccess" + "github.com/kaspanet/kaspad/infrastructure/config" + "github.com/kaspanet/kaspad/infrastructure/dbaccess" ) type appHarness struct { diff --git a/integration/tx_relay_test.go b/testing/integration/tx_relay_test.go similarity index 97% rename from integration/tx_relay_test.go rename to testing/integration/tx_relay_test.go index d6371a7c7..c51c46bdc 100644 --- a/integration/tx_relay_test.go +++ b/testing/integration/tx_relay_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/kaspanet/go-secp256k1" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" ) diff --git a/testutil/testutil.go b/testutil/testutil.go deleted file mode 100644 index 7c9dd3d2b..000000000 --- a/testutil/testutil.go +++ /dev/null @@ -1,13 +0,0 @@ -package testutil - -// AreErrorsEqual returns whether errors have the same type -// and same error string from .Error(). -func AreErrorsEqual(err1, err2 error) bool { - if err1 == nil && err2 == nil { - return true - } - if err1 == nil && err2 != nil { - return false - } - return err1.Error() == err2.Error() -} diff --git a/util/block.go b/util/block.go index 34ddcd2a2..82470d6cb 100644 --- a/util/block.go +++ b/util/block.go @@ -11,7 +11,7 @@ import ( "github.com/kaspanet/kaspad/util/mstime" "io" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/util/block_test.go b/util/block_test.go index 7fd559051..9cb4d10f9 100644 --- a/util/block_test.go +++ b/util/block_test.go @@ -7,7 +7,7 @@ package util_test import ( "bytes" "github.com/davecgh/go-spew/spew" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/daghash" "github.com/kaspanet/kaspad/util/mstime" diff --git a/util/coinbasepayload/coinbasepayload.go b/util/coinbasepayload/coinbasepayload.go index 62c261872..f297075b3 100644 --- a/util/coinbasepayload/coinbasepayload.go +++ b/util/coinbasepayload/coinbasepayload.go @@ -3,7 +3,7 @@ package coinbasepayload import ( "bytes" "encoding/binary" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/binaryserializer" "github.com/pkg/errors" ) diff --git a/util/locks/log.go b/util/locks/log.go index b4a3581a7..d38039583 100644 --- a/util/locks/log.go +++ b/util/locks/log.go @@ -1,7 +1,7 @@ package locks import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/util/panics/log.go b/util/panics/log.go index 8bf8d1da1..5b85922ad 100644 --- a/util/panics/log.go +++ b/util/panics/log.go @@ -1,7 +1,7 @@ package panics import ( - "github.com/kaspanet/kaspad/logger" + "github.com/kaspanet/kaspad/infrastructure/logger" ) var utilLog, _ = logger.Get(logger.SubsystemTags.UTIL) diff --git a/util/panics/panics.go b/util/panics/panics.go index b3e583fcd..14d772df2 100644 --- a/util/panics/panics.go +++ b/util/panics/panics.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "github.com/kaspanet/kaspad/logs" + "github.com/kaspanet/kaspad/infrastructure/logs" ) const exitHandlerTimeout = 5 * time.Second diff --git a/util/profiling/profiling.go b/util/profiling/profiling.go index a342fde85..a44b766ea 100644 --- a/util/profiling/profiling.go +++ b/util/profiling/profiling.go @@ -7,7 +7,7 @@ import ( // Required for profiling _ "net/http/pprof" - "github.com/kaspanet/kaspad/logs" + "github.com/kaspanet/kaspad/infrastructure/logs" "github.com/kaspanet/kaspad/util/panics" ) diff --git a/util/testtools/testtools.go b/util/testtools/testtools.go index f06a9ebb8..9276118c9 100644 --- a/util/testtools/testtools.go +++ b/util/testtools/testtools.go @@ -3,16 +3,16 @@ package testtools import ( "time" - "github.com/kaspanet/kaspad/dagconfig" + "github.com/kaspanet/kaspad/domain/dagconfig" "github.com/pkg/errors" - "github.com/kaspanet/kaspad/mining" + "github.com/kaspanet/kaspad/domain/mining" "github.com/kaspanet/kaspad/util/daghash" - "github.com/kaspanet/kaspad/blockdag" + "github.com/kaspanet/kaspad/domain/blockdag" - "github.com/kaspanet/kaspad/domainmessage" - "github.com/kaspanet/kaspad/txscript" + "github.com/kaspanet/kaspad/domain/txscript" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util" "github.com/kaspanet/kaspad/util/subnetworkid" ) diff --git a/util/tx.go b/util/tx.go index ce9c405fa..6499e43d6 100644 --- a/util/tx.go +++ b/util/tx.go @@ -8,7 +8,7 @@ import ( "bytes" "io" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/util/txsort/txsort.go b/util/txsort/txsort.go index c7271da72..9874a9b78 100644 --- a/util/txsort/txsort.go +++ b/util/txsort/txsort.go @@ -11,7 +11,7 @@ import ( "bytes" "sort" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/daghash" ) diff --git a/util/txsort/txsort_test.go b/util/txsort/txsort_test.go index 864424854..52483ea0e 100644 --- a/util/txsort/txsort_test.go +++ b/util/txsort/txsort_test.go @@ -11,7 +11,7 @@ import ( "path/filepath" "testing" - "github.com/kaspanet/kaspad/domainmessage" + "github.com/kaspanet/kaspad/network/domainmessage" "github.com/kaspanet/kaspad/util/txsort" )