diff --git a/domain/consensus/processes/dagtraversalmanager/window_test.go b/domain/consensus/processes/dagtraversalmanager/window_test.go index 188129bb6..399e434a7 100644 --- a/domain/consensus/processes/dagtraversalmanager/window_test.go +++ b/domain/consensus/processes/dagtraversalmanager/window_test.go @@ -19,7 +19,7 @@ func TestBlueBlockWindow(t *testing.T) { id string //id is a virtual entity that is used only for tests so we can define relations between blocks without knowing their hash expectedWindowWithGenesisPadding []string }{ - "kaspa-mainnet": { + dagconfig.MainnetParams.Name: { { parents: []string{"A"}, id: "B", @@ -91,7 +91,7 @@ func TestBlueBlockWindow(t *testing.T) { expectedWindowWithGenesisPadding: []string{"N", "M", "L", "K", "J", "I", "F", "C", "D", "H"}, }, }, - "kaspa-testnet": { + dagconfig.TestnetParams.Name: { { parents: []string{"A"}, id: "B", @@ -163,7 +163,7 @@ func TestBlueBlockWindow(t *testing.T) { expectedWindowWithGenesisPadding: []string{"N", "M", "L", "K", "J", "I", "F", "H", "C", "D"}, }, }, - "kaspa-devnet": { + dagconfig.DevnetParams.Name: { { parents: []string{"A"}, id: "B", @@ -235,7 +235,7 @@ func TestBlueBlockWindow(t *testing.T) { expectedWindowWithGenesisPadding: []string{"N", "M", "L", "K", "J", "I", "F", "H", "C", "D"}, }, }, - "kaspa-simnet": { + dagconfig.SimnetParams.Name: { { parents: []string{"A"}, id: "B", diff --git a/domain/consensus/processes/difficultymanager/difficultymanager_test.go b/domain/consensus/processes/difficultymanager/difficultymanager_test.go index 1b921f59c..4bd2a4be9 100644 --- a/domain/consensus/processes/difficultymanager/difficultymanager_test.go +++ b/domain/consensus/processes/difficultymanager/difficultymanager_test.go @@ -1,10 +1,11 @@ package difficultymanager_test import ( - "github.com/kaspanet/kaspad/util/difficulty" "testing" "time" + "github.com/kaspanet/kaspad/util/difficulty" + "github.com/kaspanet/kaspad/util/mstime" "github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing" @@ -132,9 +133,9 @@ func TestDifficulty(t *testing.T) { var expectedBits uint32 switch params.Name { - case "kaspa-testnet", "kaspa-devnet": + case dagconfig.TestnetParams.Name, dagconfig.DevnetParams.Name: expectedBits = uint32(0x1e7f83df) - case "kaspa-mainnet": + case dagconfig.MainnetParams.Name: expectedBits = uint32(0x207f83df) } diff --git a/domain/consensus/processes/pruningmanager/pruning_test.go b/domain/consensus/processes/pruningmanager/pruning_test.go index 94071618a..d0057f359 100644 --- a/domain/consensus/processes/pruningmanager/pruning_test.go +++ b/domain/consensus/processes/pruningmanager/pruning_test.go @@ -27,16 +27,16 @@ type testJSON struct { func TestPruning(t *testing.T) { expectedPruningPointByNet := map[string]map[string]string{ "chain-for-test-pruning.json": { - "kaspa-mainnet": "1582", - "kaspa-simnet": "1582", - "kaspa-devnet": "1582", - "kaspa-testnet": "1582", + dagconfig.MainnetParams.Name: "1582", + dagconfig.TestnetParams.Name: "1582", + dagconfig.DevnetParams.Name: "1582", + dagconfig.SimnetParams.Name: "1582", }, "dag-for-test-pruning.json": { - "kaspa-mainnet": "503", - "kaspa-simnet": "502", - "kaspa-devnet": "503", - "kaspa-testnet": "503", + dagconfig.MainnetParams.Name: "503", + dagconfig.TestnetParams.Name: "503", + dagconfig.DevnetParams.Name: "503", + dagconfig.SimnetParams.Name: "502", }, } diff --git a/domain/consensus/pruning_test.go b/domain/consensus/pruning_test.go index 8ca354d82..bd574ee1c 100644 --- a/domain/consensus/pruning_test.go +++ b/domain/consensus/pruning_test.go @@ -1,17 +1,18 @@ package consensus import ( + "testing" + "github.com/kaspanet/kaspad/domain/consensus/utils/testutils" "github.com/kaspanet/kaspad/domain/dagconfig" - "testing" ) func TestPruningDepth(t *testing.T) { expectedResult := map[string]uint64{ - "kaspa-mainnet": 244838, - "kaspa-testnet": 244838, - "kaspa-devnet": 244838, - "kaspa-simnet": 192038, + dagconfig.MainnetParams.Name: 244838, + dagconfig.TestnetParams.Name: 244838, + dagconfig.DevnetParams.Name: 244838, + dagconfig.SimnetParams.Name: 192038, } testutils.ForAllNets(t, true, func(t *testing.T, params *dagconfig.Params) { expected, found := expectedResult[params.Name] diff --git a/domain/dagconfig/params.go b/domain/dagconfig/params.go index 6c794b21f..20bdcbe1e 100644 --- a/domain/dagconfig/params.go +++ b/domain/dagconfig/params.go @@ -256,7 +256,7 @@ var MainnetParams = Params{ // TestnetParams defines the network parameters for the test Kaspa network. var TestnetParams = Params{ K: defaultGHOSTDAGK, - Name: "kaspa-testnet", + Name: "kaspa-testnet-2", Net: appmessage.Testnet, RPCPort: "16210", DefaultPort: "16211", diff --git a/util/difficulty/difficulty_test.go b/util/difficulty/difficulty_test.go index 2abd922f0..ed563b80e 100644 --- a/util/difficulty/difficulty_test.go +++ b/util/difficulty/difficulty_test.go @@ -2,20 +2,21 @@ package difficulty_test import ( "fmt" - "github.com/kaspanet/kaspad/domain/consensus/utils/testutils" - "github.com/kaspanet/kaspad/domain/dagconfig" - "github.com/kaspanet/kaspad/util/difficulty" "math" "math/big" "testing" + + "github.com/kaspanet/kaspad/domain/consensus/utils/testutils" + "github.com/kaspanet/kaspad/domain/dagconfig" + "github.com/kaspanet/kaspad/util/difficulty" ) func TestGetHashrateString(t *testing.T) { var results = map[string]string{ - "kaspa-mainnet": "2 H/s", - "kaspa-testnet": "131.07 KH/s", - "kaspa-devnet": "131.07 KH/s", - "kaspa-simnet": "2.00 KH/s", + dagconfig.MainnetParams.Name: "2 H/s", + dagconfig.TestnetParams.Name: "131.07 KH/s", + dagconfig.DevnetParams.Name: "131.07 KH/s", + dagconfig.SimnetParams.Name: "2.00 KH/s", } testutils.ForAllNets(t, false, func(t *testing.T, params *dagconfig.Params) { targetGenesis := difficulty.CompactToBig(params.GenesisBlock.Header.Bits())