Skip to content

Commit

Permalink
unified terminology as single-word
Browse files Browse the repository at this point in the history
  • Loading branch information
ws4charlie committed May 12, 2024
1 parent e0aaac8 commit 1def779
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions cmd/zetaclientd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func start(_ *cobra.Command, _ []string) error {

// Wait until zetacore is up
waitForZetaCore(cfg, startLogger)
startLogger.Info().Msgf("ZetaCore is ready , Trying to connect to %s", cfg.Peer)
startLogger.Info().Msgf("Zetacore is ready, trying to connect to %s", cfg.Peer)

telemetryServer := metrics.NewTelemetryServer()
go func() {
Expand Down Expand Up @@ -128,7 +128,7 @@ func start(_ *cobra.Command, _ []string) error {
startLogger.Error().Err(err).Msg("Error getting core parameters")
return err
}
startLogger.Info().Msgf("Config is updated from ZetaCore %s", maskCfg(cfg))
startLogger.Info().Msgf("Config is updated from zetacore %s", maskCfg(cfg))

go zetacoreClient.CoreContextUpdater(appContext)

Expand Down
2 changes: 1 addition & 1 deletion cmd/zetaclientd/start_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

func waitForZetaCore(config config.Config, logger zerolog.Logger) {
// wait until zetacore is up
logger.Debug().Msg("Waiting for ZetaCore to open 9090 port...")
logger.Debug().Msg("Waiting for zetacore to open 9090 port...")
for {
_, err := grpc.Dial(
fmt.Sprintf("%s:9090", config.ZetaCoreURL),
Expand Down
4 changes: 2 additions & 2 deletions e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ A config YAML file can be provided to the E2E test tool via the `--config` flag.
- `Zevm`: RPC endpoint for the ZetaChain EVM.
- `EVM`: RPC endpoint for the Ethereum network.
- `Bitcoin`: RPC endpoint for the Bitcoin network.
- `ZetaCoreGRPC`: GRPC endpoint for ZetaCore.
- `ZetaCoreRPC`: RPC endpoint for ZetaCore.
- `ZetaCoreGRPC`: GRPC endpoint for zetacore.
- `ZetaCoreRPC`: RPC endpoint for zetacore.

### Contracts Configuration:

Expand Down
2 changes: 1 addition & 1 deletion zetaclient/chains/bitcoin/signer/signer.go
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ func (signer *Signer) TryProcessOutTx(
logger.Info().Msgf("Broadcast success: nonce %d to chain %s outTxHash %s", outboundTxTssNonce, chain.String(), outTxHash)
zetaHash, err := zetacoreClient.AddTxHashToOutTxTracker(chain.ChainId, outboundTxTssNonce, outTxHash, nil, "", -1)

Check warning on line 417 in zetaclient/chains/bitcoin/signer/signer.go

View check run for this annotation

Codecov / codecov/patch

zetaclient/chains/bitcoin/signer/signer.go#L416-L417

Added lines #L416 - L417 were not covered by tests
if err != nil {
logger.Err(err).Msgf("Unable to add to tracker on ZetaCore: nonce %d chain %s outTxHash %s", outboundTxTssNonce, chain.ChainName, outTxHash)
logger.Err(err).Msgf("Unable to add to tracker on zetacore: nonce %d chain %s outTxHash %s", outboundTxTssNonce, chain.ChainName, outTxHash)

Check warning on line 419 in zetaclient/chains/bitcoin/signer/signer.go

View check run for this annotation

Codecov / codecov/patch

zetaclient/chains/bitcoin/signer/signer.go#L419

Added line #L419 was not covered by tests
}
logger.Info().Msgf("Broadcast to core successful %s", zetaHash)

Expand Down
2 changes: 1 addition & 1 deletion zetaclient/chains/evm/observer/observer.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func (ob *Observer) WithEvmJSONRPC(client interfaces.EVMJSONRPCClient) {
ob.evmJSONRPC = client
}

// WithZetacoreClient attaches a new client to interact with ZetaCore to the observer
// WithZetacoreClient attaches a new client to interact with zetacore to the observer
func (ob *Observer) WithZetacoreClient(client interfaces.ZetacoreClient) {
ob.Mu.Lock()
defer ob.Mu.Unlock()
Expand Down
2 changes: 1 addition & 1 deletion zetaclient/orchestrator/orchestrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ func (oc *Orchestrator) StartCctxScheduler(appContext *context.AppContext) {
if bn > lastBlockNum { // we have a new block
bn = lastBlockNum + 1
if bn%10 == 0 {
oc.logger.Std.Debug().Msgf("StartCctxScheduler: ZetaCore heart beat: %d", bn)
oc.logger.Std.Debug().Msgf("StartCctxScheduler: zetacore heart beat: %d", bn)

Check warning on line 241 in zetaclient/orchestrator/orchestrator.go

View check run for this annotation

Codecov / codecov/patch

zetaclient/orchestrator/orchestrator.go#L241

Added line #L241 was not covered by tests
}

balance, err := oc.zetacoreClient.GetZetaHotKeyBalance()

Check warning on line 244 in zetaclient/orchestrator/orchestrator.go

View check run for this annotation

Codecov / codecov/patch

zetaclient/orchestrator/orchestrator.go#L244

Added line #L244 was not covered by tests
Expand Down
2 changes: 1 addition & 1 deletion zetaclient/zetacore/broadcast.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var (
// gas price increase due to EIP1559 feemarket on ZetaChain
bufferMultiplier = sdktypes.MustNewDecFromStr("1.5")

// Variable function used by transactions to broadcast a message to ZetaCore. This will create enough flexibility
// Variable function used by transactions to broadcast a message to zetacore. This will create enough flexibility
// in the implementation to allow for more comprehensive unit testing.
zetacoreBroadcast BroadcastInterface = BroadcastToZetaCore
)
Expand Down
6 changes: 3 additions & 3 deletions zetaclient/zetacore/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

var _ interfaces.ZetacoreClient = &Client{}

// Client is the client to send tx to ZetaCore
// Client is the client to send tx to zetacore
type Client struct {
logger zerolog.Logger
blockHeight int64
Expand Down Expand Up @@ -168,13 +168,13 @@ func (c *Client) WaitForCoreToCreateBlocks() {
for {
block, err := c.GetLatestZetaBlock()

Check warning on line 169 in zetaclient/zetacore/client.go

View check run for this annotation

Codecov / codecov/patch

zetaclient/zetacore/client.go#L169

Added line #L169 was not covered by tests
if err == nil && block.Header.Height > 1 {
c.logger.Info().Msgf("Zeta-core height: %d", block.Header.Height)
c.logger.Info().Msgf("Zetacore height: %d", block.Header.Height)

Check warning on line 171 in zetaclient/zetacore/client.go

View check run for this annotation

Codecov / codecov/patch

zetaclient/zetacore/client.go#L171

Added line #L171 was not covered by tests
break
}
retryCount++
c.logger.Debug().Msgf("Failed to get latest Block , Retry : %d/%d", retryCount, DefaultRetryCount)

Check warning on line 175 in zetaclient/zetacore/client.go

View check run for this annotation

Codecov / codecov/patch

zetaclient/zetacore/client.go#L175

Added line #L175 was not covered by tests
if retryCount > ExtendedRetryCount {
panic(fmt.Sprintf("ZetaCore is not ready , Waited for %d seconds", DefaultRetryCount*DefaultRetryInterval))
panic(fmt.Sprintf("Zetacore is not ready, waited for %d seconds", DefaultRetryCount*DefaultRetryInterval))

Check warning on line 177 in zetaclient/zetacore/client.go

View check run for this annotation

Codecov / codecov/patch

zetaclient/zetacore/client.go#L177

Added line #L177 was not covered by tests
}
time.Sleep(DefaultRetryInterval * time.Second)
}
Expand Down

0 comments on commit 1def779

Please sign in to comment.