Skip to content

Commit

Permalink
Removed unnecessary error
Browse files Browse the repository at this point in the history
  • Loading branch information
high-moctane committed Aug 21, 2024
1 parent 4717c07 commit ce8c891
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 16 deletions.
8 changes: 3 additions & 5 deletions message.go
Original file line number Diff line number Diff line change
Expand Up @@ -1327,11 +1327,9 @@ func (ev *Event) Valid() bool {
validSig(ev.Sig)
}

var ErrEventSerialize = errors.New("failed to serialize event")

func (ev *Event) Serialize() ([]byte, error) {
if ev == nil {
return nil, fmt.Errorf("empty event: %w", ErrEventSerialize)
return nil, errors.New("nil event")
}

v := [6]any{
Expand All @@ -1345,9 +1343,9 @@ func (ev *Event) Serialize() ([]byte, error) {

ret, err := json.Marshal(&v)
if err != nil {
err = errors.Join(err, ErrEventSerialize)
return nil, fmt.Errorf("failed to marshal event: %w", err)
}
return ret, err
return ret, nil
}

func (ev *Event) Verify() (bool, error) {
Expand Down
22 changes: 11 additions & 11 deletions message_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2188,10 +2188,10 @@ func TestEvent_Valid(t *testing.T) {

func TestEvent_Serialize(t *testing.T) {
tests := []struct {
name string
in *Event
want []byte
err error
name string
in *Event
want []byte
isErr bool
}{
{
name: "ok",
Expand All @@ -2216,21 +2216,21 @@ func TestEvent_Serialize(t *testing.T) {
want: []byte(
`[0,"dbf0becf24bf8dd7d779d7fb547e6112964ff042b77a42cc2d8488636eed9f5e",1693157791,1,[["e","d2ea747b6e3a35d2a8b759857b73fcaba5e9f3cfb6f38d317e034bddc0bf0d1c","","root"],["p","dbf0becf24bf8dd7d779d7fb547e6112964ff042b77a42cc2d8488636eed9f5e"]],"powa"]`,
),
err: nil,
isErr: false,
},
{
name: "ng: nil",
in: nil,
want: nil,
err: ErrEventSerialize,
name: "ng: nil",
in: nil,
want: nil,
isErr: true,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := tt.in.Serialize()
if err != nil || tt.err != nil {
assert.ErrorIs(t, err, tt.err)
if (err != nil) != tt.isErr {
t.Errorf("unexpected error: %v", err)
return
}
assert.Equal(t, tt.want, got)
Expand Down

0 comments on commit ce8c891

Please sign in to comment.