Skip to content

Commit d31e301

Browse files
committed
fix feedback
1 parent c382748 commit d31e301

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

framework/components/blockchain/sui.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func generateKeyData(ctx context.Context, containerName string, keyCipherType st
131131
}
132132
key, err := parseSuiKeytoolGenerateJSON(keyOut)
133133
if err != nil {
134-
return nil, fmt.Errorf("%w (raw output: %.300q)", err, keyOut)
134+
return nil, fmt.Errorf("failed to parse sui keytool generate output: %w", err)
135135
}
136136

137137
framework.L.Info().Str("suiAddress", key.SuiAddress).Msg("CTF test key generated")

framework/components/blockchain/sui_test.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package blockchain
22

33
import (
4+
"bytes"
45
"strings"
56
"testing"
67

8+
"github.com/docker/docker/pkg/stdcopy"
79
"github.com/stretchr/testify/require"
810
)
911

@@ -38,9 +40,11 @@ func TestParseSuiKeytoolGenerateJSON(t *testing.T) {
3840

3941
t.Run("docker multiplexed stdout", func(t *testing.T) {
4042
t.Parallel()
41-
// stdcopy multiplex: 1 = stdout, then payload
42-
mux := string([]byte{1}) + compact
43-
got, err := parseSuiKeytoolGenerateJSON(mux)
43+
var buf bytes.Buffer
44+
w := stdcopy.NewStdWriter(&buf, stdcopy.Stdout)
45+
_, err := w.Write([]byte(compact))
46+
require.NoError(t, err)
47+
got, err := parseSuiKeytoolGenerateJSON(buf.String())
4448
require.NoError(t, err)
4549
require.Equal(t, addr, got.SuiAddress)
4650
})

0 commit comments

Comments
 (0)