conform imports to schema defined in CONTRIBUTING.md (#150)

* use multi-import grouping * terminate all newlines in import groups * group go-fil-markets, as per style guide * replace go-filecoin with go-fil-markets in CONTRIBUTING.md
filecoin-project · Mar 14, 2020 · 76144be · 76144be
1 parent d682069
commit 76144be
Show file tree

Hide file tree

Showing 61 changed files with 232 additions and 204 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 First, thank you for your interest in contributing to this project! Before you pick up your first issue and start
 changing code, please:
- 
+
 1. Review all documentation for the module you're interested in.
 1. Look through the [issues for this repo](https://github.com/filecoin-project/go-fil-markets/issues) for relevant discussions.
 1. If you have questions about an issue, post a comment in the issue.
@@ -30,15 +30,15 @@ Before a PR can be merged to `master`, it must:
 
 ### Conventions and Style
 
-#### Imports 
+#### Imports
 We use the following import ordering.
 ```
 import (
         [stdlib packages, alpha-sorted]
         <single, empty line>
         [external packages]
         <single, empty line>
-        [go-filecoin packages]
+        [go-fil-markets packages]
 )
 ```
 
@@ -65,4 +65,4 @@ Comments are a communication to other developers (including your future self) to
 
 - A `TODO:` comment describes a change that is desired but could not be immediately implemented. It must include a reference to a GitHub issue outlining whatever prevents the thing being done now (which could just be a matter of priority).
 - A `NOTE:` comment indicates an aside, some background info, or ideas for future improvement, rather than the intent of the current code. It's often fine to document such ideas alongside the code rather than an issue (at the loss of a space for discussion).
-- `FIXME`, `HACK`, `XXX` and similar tags indicating that some code is to be avoided in favour of `TODO`, `NOTE` or some straight prose.
+- `FIXME`, `HACK`, `XXX` and similar tags indicating that some code is to be avoided in favour of `TODO`, `NOTE` or some straight prose.
diff --git a/filestore/mocks/File.go b/filestore/mocks/File.go
diff --git a/filestore/mocks/FileStore.go b/filestore/mocks/FileStore.go
diff --git a/pieceio/mocks/CarIO.go b/pieceio/mocks/CarIO.go
diff --git a/pieceio/mocks/PieceIO.go b/pieceio/mocks/PieceIO.go
diff --git a/pieceio/mocks/PreparedCar.go b/pieceio/mocks/PreparedCar.go
diff --git a/pieceio/mocks/ReadStore.go b/pieceio/mocks/ReadStore.go
diff --git a/pieceio/mocks/SectorCalculator.go b/pieceio/mocks/SectorCalculator.go
diff --git a/pieceio/mocks/WriteStore.go b/pieceio/mocks/WriteStore.go
diff --git a/pieceio/pieceio_test.go b/pieceio/pieceio_test.go
@@ -4,19 +4,11 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-
 	"io"
 	"testing"
 
-	"github.com/filecoin-project/go-fil-markets/filestore"
-	fsmocks "github.com/filecoin-project/go-fil-markets/filestore/mocks"
-	"github.com/filecoin-project/go-fil-markets/pieceio"
-	"github.com/filecoin-project/go-fil-markets/pieceio/cario"
-	pmocks "github.com/filecoin-project/go-fil-markets/pieceio/mocks"
-
 	"github.com/filecoin-project/go-sectorbuilder"
 	"github.com/filecoin-project/specs-actors/actors/abi"
-
 	"github.com/ipfs/go-cid"
 	dag "github.com/ipfs/go-merkledag"
 	dstest "github.com/ipfs/go-merkledag/test"
@@ -25,6 +17,12 @@ import (
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+
+	"github.com/filecoin-project/go-fil-markets/filestore"
+	fsmocks "github.com/filecoin-project/go-fil-markets/filestore/mocks"
+	"github.com/filecoin-project/go-fil-markets/pieceio"
+	"github.com/filecoin-project/go-fil-markets/pieceio/cario"
+	pmocks "github.com/filecoin-project/go-fil-markets/pieceio/mocks"
 )
 
 func Test_ThereAndBackAgain(t *testing.T) {

diff --git a/pieceio/types.go b/pieceio/types.go
@@ -3,12 +3,12 @@ package pieceio
 import (
 	"io"
 
-	"github.com/filecoin-project/go-fil-markets/filestore"
 	"github.com/filecoin-project/specs-actors/actors/abi"
-
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	"github.com/ipld/go-ipld-prime"
+
+	"github.com/filecoin-project/go-fil-markets/filestore"
 )
 
 type WriteStore interface {

diff --git a/piecestore/piecestore_test.go b/piecestore/piecestore_test.go
@@ -4,13 +4,13 @@ import (
 	"math/rand"
 	"testing"
 
+	"github.com/filecoin-project/specs-actors/actors/abi"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/filecoin-project/go-fil-markets/piecestore"
 	"github.com/filecoin-project/go-fil-markets/shared_testutil"
-	"github.com/filecoin-project/specs-actors/actors/abi"
 )
 
 func TestStorePieceInfo(t *testing.T) {

diff --git a/retrievalmarket/discovery/discovery.go b/retrievalmarket/discovery/discovery.go
@@ -1,8 +1,9 @@
 package discovery
 
 import (
-	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	cbor "github.com/ipfs/go-ipld-cbor"
+
+	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 )
 
 func init() {

diff --git a/retrievalmarket/impl/blockunsealing/blockunsealing_test.go b/retrievalmarket/impl/blockunsealing/blockunsealing_test.go
@@ -7,6 +7,7 @@ import (
 	"math/rand"
 	"testing"
 
+	"github.com/filecoin-project/specs-actors/actors/abi"
 	"github.com/ipfs/go-datastore"
 	dss "github.com/ipfs/go-datastore/sync"
 	bstore "github.com/ipfs/go-ipfs-blockstore"
@@ -22,7 +23,6 @@ import (
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket/impl/blockunsealing"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket/impl/testnodes"
 	tut "github.com/filecoin-project/go-fil-markets/shared_testutil"
-	"github.com/filecoin-project/specs-actors/actors/abi"
 )
 
 func TestNewLoaderWithUnsealing(t *testing.T) {

diff --git a/retrievalmarket/impl/client.go b/retrievalmarket/impl/client.go
@@ -5,6 +5,9 @@ import (
 	"reflect"
 	"sync"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-statemachine/fsm"
+	"github.com/filecoin-project/specs-actors/actors/abi"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
@@ -15,14 +18,11 @@ import (
 	"github.com/libp2p/go-libp2p-core/peer"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket/impl/blockio"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket/impl/clientstates"
 	rmnet "github.com/filecoin-project/go-fil-markets/retrievalmarket/network"
 	"github.com/filecoin-project/go-fil-markets/storedcounter"
-	"github.com/filecoin-project/go-statemachine/fsm"
-	"github.com/filecoin-project/specs-actors/actors/abi"
 )
 
 var log = logging.Logger("retrieval")

diff --git a/retrievalmarket/impl/client_test.go b/retrievalmarket/impl/client_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/specs-actors/actors/abi"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
 	dss "github.com/ipfs/go-datastore/sync"
@@ -21,7 +22,6 @@ import (
 	rmnet "github.com/filecoin-project/go-fil-markets/retrievalmarket/network"
 	tut "github.com/filecoin-project/go-fil-markets/shared_testutil"
 	"github.com/filecoin-project/go-fil-markets/storedcounter"
-	"github.com/filecoin-project/specs-actors/actors/abi"
 )
 
 func TestClient_Query(t *testing.T) {

diff --git a/retrievalmarket/impl/clientstates/client_fsm.go b/retrievalmarket/impl/clientstates/client_fsm.go
@@ -4,11 +4,12 @@ import (
 	"fmt"
 
 	"github.com/filecoin-project/go-address"
-	rm "github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-statemachine/fsm"
 	"github.com/filecoin-project/specs-actors/actors/abi"
 	"github.com/filecoin-project/specs-actors/actors/abi/big"
 	"golang.org/x/xerrors"
+
+	rm "github.com/filecoin-project/go-fil-markets/retrievalmarket"
 )
 
 func recordPaymentOwed(deal *rm.ClientDealState, totalProcessed uint64, paymentOwed abi.TokenAmount) error {

diff --git a/retrievalmarket/impl/clientstates/client_states.go b/retrievalmarket/impl/clientstates/client_states.go
@@ -3,11 +3,12 @@ package clientstates
 import (
 	"context"
 
-	rm "github.com/filecoin-project/go-fil-markets/retrievalmarket"
-	rmnet "github.com/filecoin-project/go-fil-markets/retrievalmarket/network"
 	"github.com/filecoin-project/go-statemachine/fsm"
 	"github.com/filecoin-project/specs-actors/actors/abi"
 	"github.com/filecoin-project/specs-actors/actors/abi/big"
+
+	rm "github.com/filecoin-project/go-fil-markets/retrievalmarket"
+	rmnet "github.com/filecoin-project/go-fil-markets/retrievalmarket/network"
 )
 
 // ClientDealEnvironment is a bridge to the environment a client deal is executing in

diff --git a/retrievalmarket/impl/clientstates/client_states_test.go b/retrievalmarket/impl/clientstates/client_states_test.go
@@ -6,22 +6,21 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-statemachine/fsm"
-
+	fsmtest "github.com/filecoin-project/go-statemachine/fsm/testutil"
+	"github.com/filecoin-project/specs-actors/actors/abi"
+	"github.com/filecoin-project/specs-actors/actors/abi/big"
+	"github.com/filecoin-project/specs-actors/actors/builtin/paych"
 	"github.com/ipfs/go-cid"
 	mh "github.com/multiformats/go-multihash"
 	"github.com/stretchr/testify/require"
 
-	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	clientstates "github.com/filecoin-project/go-fil-markets/retrievalmarket/impl/clientstates"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket/impl/testnodes"
 	rmnet "github.com/filecoin-project/go-fil-markets/retrievalmarket/network"
 	testnet "github.com/filecoin-project/go-fil-markets/shared_testutil"
-	fsmtest "github.com/filecoin-project/go-statemachine/fsm/testutil"
-	"github.com/filecoin-project/specs-actors/actors/abi"
-	"github.com/filecoin-project/specs-actors/actors/abi/big"
-	"github.com/filecoin-project/specs-actors/actors/builtin/paych"
 )
 
 type consumeBlockResponse struct {

diff --git a/retrievalmarket/impl/integration_test.go b/retrievalmarket/impl/integration_test.go
@@ -6,23 +6,22 @@ import (
 	"testing"
 	"time"
 
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/specs-actors/actors/abi"
+	"github.com/filecoin-project/specs-actors/actors/abi/big"
+	"github.com/filecoin-project/specs-actors/actors/builtin/paych"
 	"github.com/ipfs/go-cid"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/filecoin-project/go-address"
-
 	"github.com/filecoin-project/go-fil-markets/pieceio/cario"
 	"github.com/filecoin-project/go-fil-markets/piecestore"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	retrievalimpl "github.com/filecoin-project/go-fil-markets/retrievalmarket/impl"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket/impl/testnodes"
 	rmnet "github.com/filecoin-project/go-fil-markets/retrievalmarket/network"
 	tut "github.com/filecoin-project/go-fil-markets/shared_testutil"
-	"github.com/filecoin-project/specs-actors/actors/abi"
-	"github.com/filecoin-project/specs-actors/actors/abi/big"
-	"github.com/filecoin-project/specs-actors/actors/builtin/paych"
 )
 
 func TestClientCanMakeQueryToProvider(t *testing.T) {