Merge branch 'main' into mtsitrin/325-refactor-dymint-config-to-suppo…

…rt-loading-configuration-from-file

block/manager_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/hex"
+	"errors"
 	"sync/atomic"
 	"testing"
 	"time"

node/node_test.go

@@ -3,12 +3,14 @@ package node
 import (
 	"context"
 	"crypto/rand"
+	"encoding/hex"
+	"errors"
 	"testing"
 	"time"
 
 	"github.com/dymensionxyz/dymint/da"
-	"github.com/dymensionxyz/dymint/node/events"
 	"github.com/dymensionxyz/dymint/mempool"
+	"github.com/dymensionxyz/dymint/node/events"
 	"github.com/dymensionxyz/dymint/settlement"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -30,29 +32,8 @@ func TestStartup(t *testing.T) {
 	assert := assert.New(t)
 	require := require.New(t)
 
-	app := &mocks.Application{}
-	app.On("InitChain", mock.Anything).Return(abci.ResponseInitChain{})
-	key, _, err := crypto.GenerateEd25519Key(rand.Reader)
-	require.NoError(err)
-
-	signingKey, _, err := crypto.GenerateEd25519Key(rand.Reader)
-	require.NoError(err)
-
 	// TODO(omritoptix): Test with and without aggregator mode.
-
-	nodeConfig := config.NodeConfig{
-		RootDir:            "",
-		DBPath:             "",
-		P2P:                config.P2PConfig{},
-		RPC:                config.RPCConfig{},
-		Aggregator:         false,
-		BlockManagerConfig: config.BlockManagerConfig{BatchSyncInterval: time.Second * 5, BlockTime: 100 * time.Millisecond},
-		DALayer:            "mock",
-		DAConfig:           "",
-		SettlementLayer:    "mock",
-		SettlementConfig:   settlement.Config{},
-	}
-	node, err := NewNode(context.Background(), nodeConfig, key, signingKey, proxy.NewLocalClientCreator(app), &types.GenesisDoc{ChainID: "test"}, log.TestingLogger())
+	node, err := createNode()
 	require.NoError(err)
 	require.NotNil(node)
 
@@ -226,10 +207,6 @@ func createNode() (node *Node, err error) {
 	signingKey, pubkey, _ := crypto.GenerateEd25519Key(rand.Reader)
 	// TODO(omritoptix): Test with and without aggregator mode.
 	pubkeyBytes, _ := pubkey.Raw()
-	mockConfigFmt := `
-	{"proposer_pub_key": "%s"}
-	`
-	mockConfig := fmt.Sprintf(mockConfigFmt, hex.EncodeToString(pubkeyBytes))
 	nodeConfig := config.NodeConfig{
 		RootDir:            "",
 		DBPath:             "",
@@ -240,7 +217,7 @@ func createNode() (node *Node, err error) {
 		DALayer:            "mock",
 		DAConfig:           "",
 		SettlementLayer:    "mock",
-		SettlementConfig:   mockConfig,
+		SettlementConfig:   settlement.Config{ProposerPubKey: hex.EncodeToString(pubkeyBytes)},
 	}
 	node, err = NewNode(context.Background(), nodeConfig, key, signingKey, proxy.NewLocalClientCreator(app), &types.GenesisDoc{ChainID: "test"}, log.TestingLogger())
 	if err != nil {