Mirroristas/planetmint-go
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint-go.git synced 2025-11-26 15:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved initialization code to network initialization so that failures during the 1st 5 blocks disappear

Browse Source 
Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>
This commit is contained in:
Jürgen Eckel 2024-03-06 13:47:31 +01:00
parent f13c54f582
commit 7a662a260d
No known key found for this signature in database
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
testutil/network/loader.go
View File

@ -1,7 +1,6 @@
package network
import (
"bytes"
"testing"
"time"
@ -15,12 +14,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/planetmint/planetmint-go/app"
"github.com/planetmint/planetmint-go/config"
"github.com/planetmint/planetmint-go/lib"
"github.com/planetmint/planetmint-go/testutil/sample"
"github.com/planetmint/planetmint-go/util"
"github.com/planetmint/planetmint-go/util/mocks"
daotypes "github.com/planetmint/planetmint-go/x/dao/types"
elements "github.com/rddl-network/elements-rpc"
elementsmocks "github.com/rddl-network/elements-rpc/utils/mocks"
"github.com/stretchr/testify/require"
@ -50,28 +46,10 @@ func Load(t *testing.T, configs ...Config) *Network {
appLogger.SetTestingLogger(t)
// set the proper root dir for the test environment so that the abci.go logic works
conf := config.GetConfig()
net, err := New(t, validatorTmpDir, cfg)
require.NoError(t, err)
conf.ValidatorAddress = net.Validators[0].Address.String()
// set missing validator client context values for sending txs
var output bytes.Buffer
net.Validators[0].ClientCtx.BroadcastMode = "sync"
net.Validators[0].ClientCtx.FromAddress = net.Validators[0].Address
net.Validators[0].ClientCtx.FromName = net.Validators[0].Moniker
net.Validators[0].ClientCtx.NodeURI = net.Validators[0].RPCAddress
net.Validators[0].ClientCtx.Output = &output
net.Validators[0].ClientCtx.SkipConfirm = true
var daoGenState daotypes.GenesisState
cfg.Codec.MustUnmarshalJSON(cfg.GenesisState[daotypes.ModuleName], &daoGenState)
libConfig := lib.GetConfig()
libConfig.SetClientCtx(net.Validators[0].ClientCtx)
libConfig.SetRoot(net.Validators[0].ClientCtx.HomeDir)
require.NoError(t, err)
_, err = net.WaitForHeight(1)
require.NoError(t, err)
t.Cleanup(net.Cleanup)

19
testutil/network/network.go
View File

@ -2,6 +2,7 @@ package network
import (
"bufio"
"bytes"
"context"
"encoding/json"
"errors"
@ -20,6 +21,8 @@ import (
tmrand "github.com/cometbft/cometbft/libs/rand"
"github.com/cometbft/cometbft/node"
tmclient "github.com/cometbft/cometbft/rpc/client"
"github.com/planetmint/planetmint-go/config"
"github.com/planetmint/planetmint-go/lib"
"github.com/planetmint/planetmint-go/testutil/sample"
"github.com/spf13/cobra"
"google.golang.org/grpc"
@ -569,6 +572,22 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
Address: addr,
ValAddress: sdk.ValAddress(addr),
}
if i == 0 {
conf := config.GetConfig()
conf.ValidatorAddress = network.Validators[0].Address.String()
// set missing validator client context values for sending txs
var output bytes.Buffer
network.Validators[0].ClientCtx.BroadcastMode = "sync"
network.Validators[0].ClientCtx.FromAddress = network.Validators[0].Address
network.Validators[0].ClientCtx.FromName = network.Validators[0].Moniker
network.Validators[0].ClientCtx.NodeURI = network.Validators[0].RPCAddress
network.Validators[0].ClientCtx.Output = &output
network.Validators[0].ClientCtx.SkipConfirm = true
libConfig := lib.GetConfig()
libConfig.SetClientCtx(network.Validators[0].ClientCtx)
libConfig.SetRoot(network.Validators[0].ClientCtx.HomeDir)
}
}
err := initGenFiles(cfg, genAccounts, genBalances, genFiles)