From b19a815d86a06cc3dbc5afeeab21db0f086e3c9e Mon Sep 17 00:00:00 2001
From: Luca Moser <moser.luca@gmail.com>
Date: Thu, 23 Jan 2020 14:16:52 +0100
Subject: [PATCH] fixes relay-chcker tool
---
tools/relay-checker/main.go | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/tools/relay-checker/main.go b/tools/relay-checker/main.go
index 18c1d1d9..80484582 100644
--- a/tools/relay-checker/main.go
+++ b/tools/relay-checker/main.go
@@ -5,23 +5,21 @@ import (
"time"
client "github.com/iotaledger/goshimmer/client"
- "github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/iota.go/trinary"
)
func testBroadcastData(api *client.GoShimmerAPI) (trinary.Hash, error) {
txnHash, err := api.BroadcastData(txnAddr, txnData)
if err != nil {
- return "", errors.Wrapf(err, "Broadcast failed")
+ return "", fmt.Errorf("broadcast failed: %w", err)
}
return txnHash, nil
}
func testTargetGetTransactions(api *client.GoShimmerAPI, txnHash trinary.Hash) error {
// query target node for broadcasted data
- _, err := api.GetTransactionObjectsByHash([]trinary.Hash{txnHash})
- if err != nil {
- return errors.Wrapf(err, "Query target failed")
+ if _, err := api.GetTransactionObjectsByHash([]trinary.Hash{txnHash}); err != nil {
+ return fmt.Errorf("querying the target node failed: %w", err)
}
return nil
}
@@ -30,11 +28,10 @@ func testNodesGetTransactions(txnHash trinary.Hash) error {
// query nodes node for broadcasted data
for _, n := range nodes {
nodesApi := client.NewGoShimmerAPI(n)
- _, err := nodesApi.GetTransactionObjectsByHash([]trinary.Hash{txnHash})
- if err != nil {
- return errors.Wrapf(err, "Query %s failed", n)
+ if _, err := nodesApi.GetTransactionObjectsByHash([]trinary.Hash{txnHash}); err != nil {
+ return fmt.Errorf("querying node %s failed: %w", n, err)
}
- fmt.Printf("txn found in %s\n", n)
+ fmt.Printf("txn found in node %s\n", n)
}
return nil
}
--
GitLab