fix(wallet/backend.go): Return just one error instead of concatenatio…

…n of errors chore(All): Run gofmt and sort imports Signed-off-by: Sophia Koehler <sophia@perun.network>
hyperledger-labs · Dec 19, 2024 · 5e5bfb3 · 5e5bfb3
1 parent dac83b9
commit 5e5bfb3
Show file tree

Hide file tree

Showing 88 changed files with 157 additions and 79 deletions.
diff --git a/apps/payment/randomizer.go b/apps/payment/randomizer.go
@@ -16,6 +16,7 @@ package payment
 
 import (
 	"math/rand"
+
 	"perun.network/go-perun/wallet"
 
 	"perun.network/go-perun/channel"

diff --git a/backend/sim/channel/init.go b/backend/sim/channel/init.go
@@ -16,6 +16,7 @@ package channel
 
 import (
 	"math/rand"
+
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
 )

diff --git a/channel/allocation.go b/channel/allocation.go
@@ -19,6 +19,7 @@ import (
 	"io"
 	"log"
 	"math/big"
+
 	"perun.network/go-perun/wallet"
 
 	"perun.network/go-perun/wire/perunio"

diff --git a/channel/allocation_test.go b/channel/allocation_test.go
@@ -17,9 +17,10 @@ package channel_test
 import (
 	"math/big"
 	"math/rand"
-	"perun.network/go-perun/wallet"
 	"testing"
 
+	"perun.network/go-perun/wallet"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

diff --git a/channel/app.go b/channel/app.go
@@ -16,9 +16,10 @@ package channel
 
 import (
 	"encoding"
-	"github.com/pkg/errors"
 	"io"
 
+	"github.com/pkg/errors"
+
 	"perun.network/go-perun/wire/perunio"
 )
 

diff --git a/channel/backend.go b/channel/backend.go
@@ -16,6 +16,7 @@ package channel
 
 import (
 	"errors"
+
 	"perun.network/go-perun/wallet"
 )
 

diff --git a/channel/errors.go b/channel/errors.go
@@ -16,6 +16,7 @@ package channel
 
 import (
 	"fmt"
+
 	"perun.network/go-perun/wallet"
 
 	"github.com/pkg/errors"

diff --git a/channel/errors_internal_test.go b/channel/errors_internal_test.go
@@ -16,9 +16,10 @@ package channel
 
 import (
 	"errors"
-	"perun.network/go-perun/wallet"
 	"testing"
 
+	"perun.network/go-perun/wallet"
+
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/channel/machine.go b/channel/machine.go
@@ -16,9 +16,10 @@ package channel
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
 	stdio "io"
 
+	"github.com/pkg/errors"
+
 	"perun.network/go-perun/log"
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/wire/perunio"

diff --git a/channel/machine_test.go b/channel/machine_test.go
@@ -15,9 +15,10 @@
 package channel_test
 
 import (
-	"perun.network/go-perun/wallet"
 	"testing"
 
+	"perun.network/go-perun/wallet"
+
 	"github.com/stretchr/testify/require"
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"

diff --git a/channel/mock_app.go b/channel/mock_app.go
@@ -17,6 +17,7 @@ package channel
 import (
 	"encoding/binary"
 	"fmt"
+
 	"perun.network/go-perun/wallet"
 
 	"github.com/pkg/errors"

diff --git a/channel/mock_app_internal_test.go b/channel/mock_app_internal_test.go
@@ -15,9 +15,10 @@
 package channel
 
 import (
-	"perun.network/go-perun/wallet"
 	"testing"
 
+	"perun.network/go-perun/wallet"
+
 	"github.com/stretchr/testify/assert"
 
 	wiretest "perun.network/go-perun/wire/test"

diff --git a/channel/multi/adjudicator.go b/channel/multi/adjudicator.go
@@ -17,6 +17,7 @@ package multi
 import (
 	"context"
 	"fmt"
+
 	"perun.network/go-perun/channel"
 )
 

diff --git a/channel/multi/subscription.go b/channel/multi/subscription.go
@@ -16,6 +16,7 @@ package multi
 
 import (
 	"context"
+
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/wallet"
 )

diff --git a/channel/params_test.go b/channel/params_test.go
@@ -15,9 +15,10 @@
 package channel_test
 
 import (
-	"github.com/stretchr/testify/require"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
 	"perun.network/go-perun/wire/perunio"

diff --git a/channel/persistence/keyvalue/cache.go b/channel/persistence/keyvalue/cache.go
@@ -31,6 +31,7 @@ func newChannelCache() *channelCache {
 }
 
 // channelCache contains all channels.
+//
 //nolint:unused
 type channelCache struct {
 	mutex        stdsync.RWMutex

diff --git a/channel/persistence/keyvalue/persistedstate.go b/channel/persistence/keyvalue/persistedstate.go
@@ -16,6 +16,7 @@ package keyvalue
 
 import (
 	"io"
+
 	"perun.network/go-perun/wallet"
 
 	"perun.network/go-perun/channel"

diff --git a/channel/persistence/keyvalue/persister.go b/channel/persistence/keyvalue/persister.go
@@ -19,11 +19,12 @@ import (
 	"context"
 	"fmt"
 	"math"
-	"perun.network/go-perun/wallet"
 	"regexp"
 	"strconv"
 	"strings"
 
+	"perun.network/go-perun/wallet"
+
 	"github.com/pkg/errors"
 
 	"perun.network/go-perun/channel"

diff --git a/channel/persistence/nonpersister.go b/channel/persistence/nonpersister.go
@@ -16,6 +16,7 @@ package persistence
 
 import (
 	"context"
+
 	"perun.network/go-perun/wallet"
 
 	"github.com/pkg/errors"

diff --git a/channel/persistence/persistence.go b/channel/persistence/persistence.go
@@ -17,6 +17,7 @@ package persistence
 import (
 	"context"
 	"io"
+
 	"perun.network/go-perun/wallet"
 
 	"perun.network/go-perun/channel"

diff --git a/channel/persistence/statemachine_test.go b/channel/persistence/statemachine_test.go
@@ -16,10 +16,11 @@ package persistence_test
 
 import (
 	"context"
-	"perun.network/go-perun/wallet"
 	"testing"
 	"time"
 
+	"perun.network/go-perun/wallet"
+
 	"github.com/stretchr/testify/require"
 
 	"perun.network/go-perun/channel"

diff --git a/channel/persistence/test/peerchans.go b/channel/persistence/test/peerchans.go
@@ -17,6 +17,7 @@ package test
 import (
 	"bytes"
 	"fmt"
+
 	"perun.network/go-perun/wallet"
 
 	"perun.network/go-perun/channel"

diff --git a/channel/persistence/test/peerchans_internal_test.go b/channel/persistence/test/peerchans_internal_test.go
@@ -15,9 +15,10 @@
 package test
 
 import (
-	"perun.network/go-perun/wallet"
 	"testing"
 
+	"perun.network/go-perun/wallet"
+
 	"github.com/stretchr/testify/assert"
 
 	"perun.network/go-perun/channel"

diff --git a/channel/persistence/test/persistrestorer.go b/channel/persistence/test/persistrestorer.go
@@ -19,10 +19,11 @@ package test // import "perun.network/go-perun/channel/persistence/test"
 import (
 	"bytes"
 	"context"
-	"perun.network/go-perun/wallet"
 	"sync"
 	"testing"
 
+	"perun.network/go-perun/wallet"
+
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 

diff --git a/channel/persistence/test/persistrestorertest.go b/channel/persistence/test/persistrestorertest.go
@@ -17,9 +17,10 @@ package test
 import (
 	"context"
 	"math/rand"
-	"perun.network/go-perun/wallet"
 	"testing"
 
+	"perun.network/go-perun/wallet"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

diff --git a/channel/state.go b/channel/state.go
@@ -17,6 +17,7 @@ package channel
 import (
 	"encoding"
 	"io"
+
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/wire"
 

diff --git a/channel/test/app_randomizer.go b/channel/test/app_randomizer.go
@@ -16,6 +16,7 @@ package test
 
 import (
 	"math/rand"
+
 	"perun.network/go-perun/wallet"
 
 	"perun.network/go-perun/channel"

diff --git a/channel/test/mock_app_randomizer.go b/channel/test/mock_app_randomizer.go
@@ -16,6 +16,7 @@ package test
 
 import (
 	"math/rand"
+
 	"perun.network/go-perun/wallet"
 
 	"github.com/google/uuid"

diff --git a/channel/transaction_test.go b/channel/transaction_test.go
@@ -15,9 +15,10 @@
 package channel_test
 
 import (
-	"github.com/stretchr/testify/require"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
 	peruniotest "perun.network/go-perun/wire/perunio/test"

diff --git a/client/adjudicate.go b/client/adjudicate.go
@@ -16,6 +16,7 @@ package client
 
 import (
 	"context"
+
 	"perun.network/go-perun/wallet"
 
 	"github.com/pkg/errors"

diff --git a/client/appchannel_test.go b/client/appchannel_test.go
@@ -17,9 +17,10 @@ package client_test
 import (
 	"context"
 	"math/big"
-	"perun.network/go-perun/wallet"
 	"testing"
 
+	"perun.network/go-perun/wallet"
+
 	"perun.network/go-perun/channel"
 	chtest "perun.network/go-perun/channel/test"
 	"perun.network/go-perun/client"

diff --git a/client/channelconn.go b/client/channelconn.go
@@ -16,6 +16,7 @@ package client
 
 import (
 	"context"
+
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 	"perun.network/go-perun/wallet"

diff --git a/client/chanregistry.go b/client/chanregistry.go
@@ -15,9 +15,10 @@
 package client
 
 import (
-	"perun.network/go-perun/wallet"
 	"sync"
 
+	"perun.network/go-perun/wallet"
+
 	"perun.network/go-perun/channel"
 	psync "polycry.pt/poly-go/sync"
 )

diff --git a/client/client_role_test.go b/client/client_role_test.go
@@ -18,10 +18,11 @@ import (
 	"context"
 	"math/big"
 	"math/rand"
-	"perun.network/go-perun/wallet"
 	"testing"
 	"time"
 
+	"perun.network/go-perun/wallet"
+
 	"perun.network/go-perun/apps/payment"
 	chtest "perun.network/go-perun/channel/test"
 	"perun.network/go-perun/client"

diff --git a/client/client_test.go b/client/client_test.go
@@ -16,10 +16,11 @@ package client_test
 
 import (
 	"context"
-	"perun.network/go-perun/wallet"
 	"testing"
 	"time"
 
+	"perun.network/go-perun/wallet"
+
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/client/clientconn.go b/client/clientconn.go
@@ -16,6 +16,7 @@ package client
 
 import (
 	"context"
+
 	"perun.network/go-perun/wallet"
 
 	"github.com/pkg/errors"

diff --git a/client/payment_test.go b/client/payment_test.go
@@ -18,9 +18,10 @@ import (
 	"context"
 	"math/big"
 	"math/rand"
-	"perun.network/go-perun/wallet"
 	"testing"
 
+	"perun.network/go-perun/wallet"
+
 	chtest "perun.network/go-perun/channel/test"
 	"perun.network/go-perun/client"
 	ctest "perun.network/go-perun/client/test"

diff --git a/client/proposal_internal_test.go b/client/proposal_internal_test.go
@@ -16,9 +16,10 @@ package client
 
 import (
 	"math/rand"
-	"perun.network/go-perun/wallet"
 	"testing"
 
+	"perun.network/go-perun/wallet"
+
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/client/restore.go b/client/restore.go
@@ -16,6 +16,7 @@ package client
 
 import (
 	"context"
+
 	"perun.network/go-perun/wallet"
 
 	"github.com/pkg/errors"
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ import ( @@
     	"io"
     	"log"
     	"math/big"
     	"perun.network/go-perun/wallet"
     	"perun.network/go-perun/wire/perunio"
@@ Expand Down @@