centrifuge · akhilesharora · Jul 27, 2022 · Jul 27, 2022
diff --git a/anchors/anchor_test.go b/anchors/anchor_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package anchors
 

diff --git a/anchors/mocks.go b/anchors/mocks.go
@@ -1,4 +1,4 @@
-// +build integration unit testworld
+//go:build integration || unit || testworld
 
 package anchors
 

diff --git a/anchors/service_integration_test.go b/anchors/service_integration_test.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package anchors
 

diff --git a/bootstrap/bootstrappers/bootstrapper_test.go b/bootstrap/bootstrappers/bootstrapper_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package bootstrappers
 

diff --git a/bootstrap/test_bootstrapper.go b/bootstrap/test_bootstrapper.go
@@ -1,4 +1,4 @@
-// +build integration unit
+//go:build integration || unit
 
 package bootstrap
 

diff --git a/centchain/api_integration_test.go b/centchain/api_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package centchain_test
 

diff --git a/centchain/api_test.go b/centchain/api_test.go
@@ -1,5 +1,4 @@
 //go:build unit
-// +build unit
 
 package centchain
 

diff --git a/centchain/mocks.go b/centchain/mocks.go
@@ -1,5 +1,4 @@
 //go:build unit || integration
-// +build unit integration
 
 package centchain
 

diff --git a/cmd/centrifuge/create_config_test.go b/cmd/centrifuge/create_config_test.go
@@ -1,4 +1,4 @@
-// +build cmd
+//go:build cmd
 
 package main
 

diff --git a/cmd/common_test.go b/cmd/common_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package cmd
 

diff --git a/config/configstore/accounts_test.go b/config/configstore/accounts_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package configstore
 

diff --git a/config/configstore/bootstrapper_test.go b/config/configstore/bootstrapper_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package configstore
 

diff --git a/config/configstore/mocks.go b/config/configstore/mocks.go
@@ -1,4 +1,4 @@
-// +build unit integration testworld
+//go:build unit || integration || testworld
 
 package configstore
 

diff --git a/config/configstore/repository_test.go b/config/configstore/repository_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package configstore
 

diff --git a/config/configstore/service_integration_test.go b/config/configstore/service_integration_test.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package configstore_test
 

diff --git a/config/configstore/service_test.go b/config/configstore/service_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package configstore
 

diff --git a/config/configuration_test.go b/config/configuration_test.go
@@ -1,5 +1,4 @@
 //go:build unit
-// +build unit
 
 package config
 

diff --git a/config/mocks.go b/config/mocks.go
@@ -1,5 +1,4 @@
 //go:build integration || unit
-// +build integration unit
 
 package config
 

diff --git a/contextutil/context_test.go b/contextutil/context_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package contextutil
 

diff --git a/crypto/ed25519/ed25519_test.go b/crypto/ed25519/ed25519_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package ed25519
 

diff --git a/crypto/generate_test.go b/crypto/generate_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package crypto
 

diff --git a/crypto/secp256k1/secp256k1_test.go b/crypto/secp256k1/secp256k1_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package secp256k1
 

diff --git a/crypto/sign_test.go b/crypto/sign_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package crypto
 

diff --git a/crypto/verify_test.go b/crypto/verify_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package crypto
 

diff --git a/documents/attribute_test.go b/documents/attribute_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents
 

diff --git a/documents/bootstrapper_test.go b/documents/bootstrapper_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents
 

diff --git a/documents/compute_fields_test.go b/documents/compute_fields_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents
 

diff --git a/documents/converters_test.go b/documents/converters_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents
 

diff --git a/documents/coredocument_test.go b/documents/coredocument_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents
 

diff --git a/documents/decimal_test.go b/documents/decimal_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents
 

diff --git a/documents/entity/converters_test.go b/documents/entity/converters_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package entity
 

diff --git a/documents/entity/mocks.go b/documents/entity/mocks.go
@@ -1,4 +1,4 @@
-// +build integration unit testworld
+//go:build integration || unit || testworld
 
 package entity
 

diff --git a/documents/entity/model_test.go b/documents/entity/model_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package entity
 

diff --git a/documents/entity/service_test.go b/documents/entity/service_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package entity
 

diff --git a/documents/entity/validator_test.go b/documents/entity/validator_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package entity
 

diff --git a/documents/entityrelationship/mocks.go b/documents/entityrelationship/mocks.go
@@ -1,4 +1,4 @@
-// +build integration unit testworld
+//go:build integration || unit || testworld
 
 package entityrelationship
 

diff --git a/documents/entityrelationship/model_test.go b/documents/entityrelationship/model_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package entityrelationship
 

diff --git a/documents/entityrelationship/repository_test.go b/documents/entityrelationship/repository_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package entityrelationship
 

diff --git a/documents/entityrelationship/service_test.go b/documents/entityrelationship/service_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package entityrelationship
 

diff --git a/documents/entityrelationship/validator_test.go b/documents/entityrelationship/validator_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package entityrelationship
 

diff --git a/documents/generic/mocks.go b/documents/generic/mocks.go
@@ -1,4 +1,4 @@
-// +build integration unit testworld
+//go:build integration || unit || testworld
 
 package generic
 

diff --git a/documents/generic/model_test.go b/documents/generic/model_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package generic
 

diff --git a/documents/generic/service_test.go b/documents/generic/service_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package generic
 

diff --git a/documents/mocks.go b/documents/mocks.go
@@ -1,4 +1,4 @@
-// +build integration unit testworld
+//go:build integration || unit || testworld
 
 package documents
 

diff --git a/documents/processor_test.go b/documents/processor_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents
 

diff --git a/documents/read_acls_test.go b/documents/read_acls_test.go
@@ -1,5 +1,4 @@
 //go:build unit
-// +build unit
 
 package documents
 

diff --git a/documents/registry_test.go b/documents/registry_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents_test
 

diff --git a/documents/repository_test.go b/documents/repository_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents
 

diff --git a/documents/service_test.go b/documents/service_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents
 

diff --git a/documents/types_test.go b/documents/types_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents
 

diff --git a/documents/validator_test.go b/documents/validator_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents
 

diff --git a/documents/write_acls_test.go b/documents/write_acls_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package documents
 

diff --git a/errors/errors_test.go b/errors/errors_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package errors
 

diff --git a/ethereum/geth_client_integration_test.go b/ethereum/geth_client_integration_test.go
@@ -1,4 +1,4 @@
-// +build integration
+//go:build integration
 
 package ethereum_test
 

diff --git a/ethereum/geth_client_test.go b/ethereum/geth_client_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package ethereum
 

diff --git a/ethereum/mocks.go b/ethereum/mocks.go
@@ -1,4 +1,4 @@
-// +build integration unit
+//go:build integration || unit
 
 package ethereum
 

diff --git a/go.mod b/go.mod
@@ -44,7 +44,6 @@ require (
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	github.com/whyrusleeping/go-logging v0.0.1
 	golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871
-	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2
 	google.golang.org/grpc v1.40.0
 )
 
@@ -239,6 +238,7 @@ require (
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.19.1 // indirect
 	golang.org/x/mod v0.4.2 // indirect
+	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 	golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
 	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect

diff --git a/http/bootstrapper_test.go b/http/bootstrapper_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package http
 

diff --git a/http/coreapi/types_test.go b/http/coreapi/types_test.go
@@ -1,5 +1,4 @@
 //go:build unit
-// +build unit
 
 package coreapi
 

diff --git a/http/health/health_test.go b/http/health/health_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package health
 

diff --git a/http/mocks.go b/http/mocks.go
@@ -1,4 +1,4 @@
-// +build unit integration
+//go:build unit || integration
 
 package http
 

diff --git a/http/router_test.go b/http/router_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package http
 

diff --git a/http/server.go b/http/server.go
@@ -6,10 +6,10 @@ import (
 	"sync"
 	"time"
 
+	"context"
 	"github.com/centrifuge/go-centrifuge/utils/httputils"
 	"github.com/go-chi/render"
 	logging "github.com/ipfs/go-log"
-	"golang.org/x/net/context"
 )
 
 var log = logging.Logger("api-server")

diff --git a/http/server_test.go b/http/server_test.go
@@ -1,4 +1,4 @@
-// +build unit
+//go:build unit
 
 package http