Add version in module name (#22)

* Add version in module name * Fix internal imports
blockcypher · Sep 16, 2020 · eb169fb · eb169fb
1 parent b00362d
commit eb169fb
Show file tree

Hide file tree

Showing 28 changed files with 43 additions and 39 deletions.
diff --git a/client/node_api.go b/client/node_api.go
@@ -17,8 +17,8 @@ package client
 import (
 	"fmt"
 
-	"github.com/blockcypher/libgrin/api"
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/api"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 )
 
 // NodeAPI struct

diff --git a/client/node_api_test.go b/client/node_api_test.go
@@ -23,8 +23,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/blockcypher/libgrin/api"
-	"github.com/blockcypher/libgrin/client"
+	"github.com/blockcypher/libgrin/v4/api"
+	"github.com/blockcypher/libgrin/v4/client"
 	"github.com/gorilla/mux"
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"

diff --git a/client/owner_api.go b/client/owner_api.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/blockcypher/libgrin/core"
-	"github.com/blockcypher/libgrin/libwallet"
+	"github.com/blockcypher/libgrin/v4/core"
+	"github.com/blockcypher/libgrin/v4/libwallet"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/client/rpchttp_test.go b/client/rpchttp_test.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/blockcypher/libgrin/client"
+	"github.com/blockcypher/libgrin/v4/client"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/client/secure_owner_api.go b/client/secure_owner_api.go
@@ -22,9 +22,9 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/blockcypher/libgrin/libwallet"
-	"github.com/blockcypher/libgrin/libwallet/slatepack"
-	"github.com/blockcypher/libgrin/libwallet/slateversions"
+	"github.com/blockcypher/libgrin/v4/libwallet"
+	"github.com/blockcypher/libgrin/v4/libwallet/slatepack"
+	"github.com/blockcypher/libgrin/v4/libwallet/slateversions"
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/google/uuid"
 

diff --git a/core/blocks.go b/core/blocks.go
@@ -14,7 +14,7 @@
 
 package core
 
-import "github.com/blockcypher/libgrin/core/pow"
+import "github.com/blockcypher/libgrin/v4/core/pow"
 
 // BlockHeader is a block header, fairly standard compared to other blockchains.
 type BlockHeader struct {

diff --git a/core/pow.go b/core/pow.go
@@ -15,8 +15,8 @@
 package core
 
 import (
-	"github.com/blockcypher/libgrin/core/consensus"
-	"github.com/blockcypher/libgrin/core/pow"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/pow"
 )
 
 const maxSols uint32 = 10

diff --git a/core/pow/cuckaroo.go b/core/pow/cuckaroo.go
@@ -17,7 +17,7 @@ package pow
 import (
 	"errors"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 )
 
 // https://github.com/mimblewimble/grin/blob/master/core/src/pow/cuckaroo.rs

diff --git a/core/pow/cuckaroo_test.go b/core/pow/cuckaroo_test.go
@@ -16,7 +16,7 @@ package pow
 import (
 	"testing"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/core/pow/cuckarood.go b/core/pow/cuckarood.go
@@ -17,7 +17,7 @@ package pow
 import (
 	"errors"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 )
 
 // NewCuckaroodCtx instantiates a new CuckaroodContext as a PowContext. Note that this can't

diff --git a/core/pow/cuckarood_test.go b/core/pow/cuckarood_test.go
@@ -17,7 +17,7 @@ package pow
 import (
 	"testing"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/core/pow/cuckaroom.go b/core/pow/cuckaroom.go
@@ -17,7 +17,7 @@ package pow
 import (
 	"errors"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 )
 
 // NewCuckaroomCtx instantiates a new CuckaroomContext as a PowContext. Note that this can't

diff --git a/core/pow/cuckaroom_test.go b/core/pow/cuckaroom_test.go
@@ -17,7 +17,7 @@ package pow
 import (
 	"testing"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/core/pow/cuckarooz.go b/core/pow/cuckarooz.go
@@ -17,7 +17,7 @@ package pow
 import (
 	"errors"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 )
 
 // NewCuckaroozCtx instantiates a new CuckaroozContext as a PowContext. Note that this can't

diff --git a/core/pow/cuckarooz_test.go b/core/pow/cuckarooz_test.go
@@ -17,7 +17,7 @@ package pow
 import (
 	"testing"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/core/pow/cuckatoo.go b/core/pow/cuckatoo.go
@@ -17,7 +17,7 @@ package pow
 import (
 	"errors"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 )
 
 // NewCuckatooCtx instantiates a new CuckatooContext as a PowContext

diff --git a/core/pow/cuckatoo_test.go b/core/pow/cuckatoo_test.go
@@ -17,7 +17,7 @@ package pow
 import (
 	"testing"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/core/pow/types.go b/core/pow/types.go
@@ -19,7 +19,7 @@ import (
 	"math/big"
 	"strconv"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 )
 
 // PowContext is a generic interface for a solver/verifier providing common

diff --git a/core/pow_test.go b/core/pow_test.go
@@ -18,9 +18,9 @@ import (
 	"encoding/binary"
 	"testing"
 
-	"github.com/blockcypher/libgrin/core/pow"
+	"github.com/blockcypher/libgrin/v4/core/pow"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/go.mod b/go.mod
@@ -1,8 +1,9 @@
-module github.com/blockcypher/libgrin
+module github.com/blockcypher/libgrin/v4
 
 go 1.14
 
 require (
+	github.com/blockcypher/libgrin v2.0.0+incompatible
 	github.com/btcsuite/btcd v0.20.1-beta
 	github.com/btcsuite/btcutil v1.0.2
 	github.com/google/uuid v1.1.1

diff --git a/go.sum b/go.sum
@@ -1,4 +1,6 @@
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
+github.com/blockcypher/libgrin v2.0.0+incompatible h1:ESNyziuY5NjwXmYW4H8pfvZCfQvm8EtEUCIWQBN6/8s=
+github.com/blockcypher/libgrin v2.0.0+incompatible/go.mod h1:v+0kVsZz7bCDN4FZmDlKjVtU6SWvX/7EUJDadaavYz4=
 github.com/btcsuite/btcd v0.20.1-beta h1:Ik4hyJqN8Jfyv3S4AGBOmyouMsYE3EdYODkMbQjwPGw=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=

diff --git a/libwallet/address_test.go b/libwallet/address_test.go
@@ -16,9 +16,10 @@ package libwallet_test
 
 import (
 	"fmt"
-	"github.com/blockcypher/libgrin/libwallet"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/blockcypher/libgrin/v4/libwallet"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestOnionV3Conversion(t *testing.T) {

diff --git a/libwallet/api_impl_types.go b/libwallet/api_impl_types.go
@@ -15,10 +15,10 @@
 package libwallet
 
 import (
-	"github.com/blockcypher/libgrin/core"
-	"github.com/blockcypher/libgrin/keychain"
-	"github.com/blockcypher/libgrin/libwallet/slatepack"
-	"github.com/blockcypher/libgrin/libwallet/slateversions"
+	"github.com/blockcypher/libgrin/v4/core"
+	"github.com/blockcypher/libgrin/v4/keychain"
+	"github.com/blockcypher/libgrin/v4/libwallet/slatepack"
+	"github.com/blockcypher/libgrin/v4/libwallet/slateversions"
 )
 
 // SendTXArgs Send TX API Args

diff --git a/libwallet/slate.go b/libwallet/slate.go
@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/blockcypher/libgrin/core"
+	"github.com/blockcypher/libgrin/v4/core"
 	"github.com/google/uuid"
 	"github.com/mitchellh/mapstructure"
 )

diff --git a/libwallet/slatepack/address.go b/libwallet/slatepack/address.go
@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/blockcypher/libgrin/core/consensus"
+	"github.com/blockcypher/libgrin/v4/core/consensus"
 	"github.com/btcsuite/btcutil/bech32"
 )
 

diff --git a/libwallet/slateversions/v3.go b/libwallet/slateversions/v3.go
@@ -15,7 +15,7 @@
 package slateversions
 
 import (
-	"github.com/blockcypher/libgrin/core"
+	"github.com/blockcypher/libgrin/v4/core"
 	"github.com/google/uuid"
 )
 

diff --git a/libwallet/slateversions/v4.go b/libwallet/slateversions/v4.go
@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/blockcypher/libgrin/core"
+	"github.com/blockcypher/libgrin/v4/core"
 
 	"github.com/google/uuid"
 )

diff --git a/libwallet/types.go b/libwallet/types.go
@@ -19,8 +19,8 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/blockcypher/libgrin/core"
-	"github.com/blockcypher/libgrin/keychain"
+	"github.com/blockcypher/libgrin/v4/core"
+	"github.com/blockcypher/libgrin/v4/keychain"
 	"github.com/google/uuid"
 )