rename go module

sputn1ck · sputn1ck · commit 74f998c51367 · 2022-05-02T11:59:01.000+02:00
diff --git a/Makefile b/Makefile
@@ -11,9 +11,9 @@ PLUGINS = $(foreach p,$(TEST_PLUGIN_DIRS),$p/$(p:$(PLUGINS_DIR)/pl_%=%).go)
 all: build test-build
 
 build:
-	go build github.com/sputn1ck/glightning/glightning
-	go build github.com/sputn1ck/glightning/gbitcoin
-	go build github.com/sputn1ck/glightning/jrpc2
+	go build github.com/elementsproject/glightning/glightning
+	go build github.com/elementsproject/glightning/gbitcoin
+	go build github.com/elementsproject/glightning/jrpc2
 
 test-build: $(PLUGINS)
 	@rm -rf $(TEST_PLUGINS_BUILD_DIR)
diff --git a/examples/plugin/pl_btc/btc.go b/examples/plugin/pl_btc/btc.go
@@ -1,10 +1,11 @@
 package main
 
 import (
-	"github.com/sputn1ck/glightning/gbitcoin"
-	"github.com/sputn1ck/glightning/glightning"
 	"log"
 	"os"
+
+	"github.com/elementsproject/glightning/gbitcoin"
+	"github.com/elementsproject/glightning/glightning"
 )
 
 const MaxFeeMultiple uint64 = 10
diff --git a/examples/plugin/pl_dbwrites/dbwrites.go b/examples/plugin/pl_dbwrites/dbwrites.go
@@ -1,9 +1,10 @@
 package main
 
 import (
-	"github.com/sputn1ck/glightning/glightning"
 	"log"
 	"os"
+
+	"github.com/elementsproject/glightning/glightning"
 )
 
 func main() {
diff --git a/examples/plugin/pl_example/example.go b/examples/plugin/pl_example/example.go
@@ -2,10 +2,11 @@ package main
 
 import (
 	"fmt"
-	"github.com/sputn1ck/glightning/glightning"
-	"github.com/sputn1ck/glightning/jrpc2"
 	"log"
 	"os"
+
+	"github.com/elementsproject/glightning/glightning"
+	"github.com/elementsproject/glightning/jrpc2"
 )
 
 type Hello struct{}
diff --git a/examples/plugin/pl_featurebits/featurebits.go b/examples/plugin/pl_featurebits/featurebits.go
@@ -1,10 +1,11 @@
 package main
 
 import (
-	"github.com/sputn1ck/glightning/glightning"
 	"log"
 	"math/big"
 	"os"
+
+	"github.com/elementsproject/glightning/glightning"
 )
 
 func main() {
diff --git a/examples/plugin/pl_htlcacc/htlcacc.go b/examples/plugin/pl_htlcacc/htlcacc.go
@@ -1,9 +1,10 @@
 package main
 
 import (
-	"github.com/sputn1ck/glightning/glightning"
 	"log"
 	"os"
+
+	"github.com/elementsproject/glightning/glightning"
 )
 
 func main() {
diff --git a/examples/plugin/pl_method/method.go b/examples/plugin/pl_method/method.go
@@ -3,10 +3,11 @@ package main
 import (
 	"errors"
 	"fmt"
-	"github.com/sputn1ck/glightning/glightning"
-	"github.com/sputn1ck/glightning/jrpc2"
 	"log"
 	"os"
+
+	"github.com/elementsproject/glightning/glightning"
+	"github.com/elementsproject/glightning/jrpc2"
 )
 
 type RpcMethodWithParams struct {
diff --git a/examples/plugin/pl_openchan/openchan.go b/examples/plugin/pl_openchan/openchan.go
@@ -1,9 +1,10 @@
 package main
 
 import (
-	"github.com/sputn1ck/glightning/glightning"
 	"log"
 	"os"
+
+	"github.com/elementsproject/glightning/glightning"
 )
 
 func main() {
diff --git a/examples/plugin/pl_rpccmd/rpccmd.go b/examples/plugin/pl_rpccmd/rpccmd.go
@@ -1,9 +1,10 @@
 package main
 
 import (
-	"github.com/sputn1ck/glightning/glightning"
 	"log"
 	"os"
+
+	"github.com/elementsproject/glightning/glightning"
 )
 
 func main() {
diff --git a/examples/rpc/example.go b/examples/rpc/example.go
@@ -2,8 +2,9 @@ package main
 
 import (
 	"fmt"
-	"github.com/sputn1ck/glightning/glightning"
 	"sync"
+
+	"github.com/elementsproject/glightning/glightning"
 )
 
 func main() {
diff --git a/gbitcoin/bitcoind.go b/gbitcoin/bitcoind.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/sputn1ck/glightning/jrpc2"
 	"io/ioutil"
 	"log"
 	"math"
@@ -15,6 +14,8 @@ import (
 	"strconv"
 	"sync/atomic"
 	"time"
+
+	"github.com/elementsproject/glightning/jrpc2"
 )
 
 // taken from bitcoind
@@ -470,21 +471,21 @@ func (r *GetBlockHeaderReq) Name() string {
 }
 
 type GetBlockHeaderRes struct {
-	Hash              string `json:"hash"`
-	Confirmations     uint32 `json:"confirmations"`
-	Height            uint32 `json:"height"`
-	Version           uint32 `json:"version"`
-	VersionHex        string `json:"versionHex"`
-	Merkleroot        string `json:"merkleroot"`
-	Time              uint64 `json:"time"`
-	Mediantime        uint64 `json:"mediantime"`
-	Nonce             uint32 `json:"nonce"`
-	Bits              string `json:"bits"`
+	Hash              string  `json:"hash"`
+	Confirmations     uint32  `json:"confirmations"`
+	Height            uint32  `json:"height"`
+	Version           uint32  `json:"version"`
+	VersionHex        string  `json:"versionHex"`
+	Merkleroot        string  `json:"merkleroot"`
+	Time              uint64  `json:"time"`
+	Mediantime        uint64  `json:"mediantime"`
+	Nonce             uint32  `json:"nonce"`
+	Bits              string  `json:"bits"`
 	Difficulty        float64 `json:"difficulty"`
-	Chainwork         string `json:"chainwork"`
-	NTx               uint32 `json:"nTx"`
-	Previousblockhash string `json:"previousblockhash"`
-	Nextblockhash     string `json:"nextblockhash"`
+	Chainwork         string  `json:"chainwork"`
+	NTx               uint32  `json:"nTx"`
+	Previousblockhash string  `json:"previousblockhash"`
+	Nextblockhash     string  `json:"nextblockhash"`
 }
 
 func (b *Bitcoin) GetBlockHeader(blockHash string) (*GetBlockHeaderRes, error) {
diff --git a/gelements/elementsd.go b/gelements/elementsd.go
@@ -15,7 +15,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/sputn1ck/glightning/jrpc2"
+	"github.com/elementsproject/glightning/jrpc2"
 )
 
 // taken from bitcoind
diff --git a/glightning/bitcoin_backend.go b/glightning/bitcoin_backend.go
@@ -11,8 +11,9 @@ package glightning
 // see https://github.com/ElementsProject/lightning/pull/3488
 // for all the implementation details, to date.
 import (
-	"github.com/sputn1ck/glightning/jrpc2"
 	"strings"
+
+	"github.com/elementsproject/glightning/jrpc2"
 )
 
 type BtcBackend_MethodName string
diff --git a/glightning/lightning.go b/glightning/lightning.go
@@ -4,9 +4,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/sputn1ck/glightning/jrpc2"
 	"log"
 	"path/filepath"
+
+	"github.com/elementsproject/glightning/jrpc2"
 )
 
 // This file's the one that holds all the objects for the
diff --git a/glightning/lightning_test.go b/glightning/lightning_test.go
@@ -4,13 +4,14 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
-	"github.com/sputn1ck/glightning/glightning"
-	"github.com/stretchr/testify/assert"
 	"io"
 	"io/ioutil"
 	"net"
 	"os"
 	"testing"
+
+	"github.com/elementsproject/glightning/glightning"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestListTransactions(t *testing.T) {
diff --git a/glightning/plugin.go b/glightning/plugin.go
@@ -5,12 +5,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/sputn1ck/glightning/jrpc2"
 	"io"
 	"log"
 	"os"
 	"reflect"
 	"strings"
+
+	"github.com/elementsproject/glightning/jrpc2"
 )
 
 type Subscription string
diff --git a/glightning/plugin_test.go b/glightning/plugin_test.go
@@ -3,15 +3,16 @@ package glightning_test
 import (
 	"bufio"
 	"fmt"
-	"github.com/sputn1ck/glightning/glightning"
-	"github.com/sputn1ck/glightning/jrpc2"
-	"github.com/stretchr/testify/assert"
 	"io"
 	"log"
 	"os"
 	"sync"
 	"testing"
 	"time"
+
+	"github.com/elementsproject/glightning/glightning"
+	"github.com/elementsproject/glightning/jrpc2"
+	"github.com/stretchr/testify/assert"
 )
 
 type HiMethod struct {
diff --git a/glightning/pluginrpc_test.go b/glightning/pluginrpc_test.go
@@ -2,9 +2,10 @@ package glightning_test
 
 import (
 	"fmt"
-	"github.com/sputn1ck/glightning/glightning"
-	"github.com/sputn1ck/glightning/jrpc2"
 	"testing"
+
+	"github.com/elementsproject/glightning/glightning"
+	"github.com/elementsproject/glightning/jrpc2"
 )
 
 type ParamMethod struct {
diff --git a/glightning/tests/interop_test.go b/glightning/tests/interop_test.go
@@ -4,9 +4,6 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
-	"github.com/sputn1ck/glightning/gbitcoin"
-	"github.com/sputn1ck/glightning/glightning"
-	"github.com/stretchr/testify/assert"
 	"io"
 	"io/ioutil"
 	"log"
@@ -19,6 +16,10 @@ import (
 	"syscall"
 	"testing"
 	"time"
+
+	"github.com/elementsproject/glightning/gbitcoin"
+	"github.com/elementsproject/glightning/glightning"
+	"github.com/stretchr/testify/assert"
 )
 
 const defaultTimeout int = 10
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/sputn1ck/glightning
+module github.com/elementsproject/glightning
 
 go 1.16
 
diff --git a/jrpc2/client_test.go b/jrpc2/client_test.go
@@ -2,14 +2,15 @@ package jrpc2_test
 
 import (
 	"bufio"
-	"github.com/sputn1ck/glightning/jrpc2"
-	"github.com/stretchr/testify/assert"
 	"io"
 	"log"
 	"os"
 	"sync"
 	"testing"
 	"time"
+
+	"github.com/elementsproject/glightning/jrpc2"
+	"github.com/stretchr/testify/assert"
 )
 
 type ClientSubtract struct {
diff --git a/jrpc2/jsonrpc2_test.go b/jrpc2/jsonrpc2_test.go
@@ -3,10 +3,11 @@ package jrpc2_test
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/sputn1ck/glightning/jrpc2"
-	"github.com/stretchr/testify/assert"
 	"reflect"
 	"testing"
+
+	"github.com/elementsproject/glightning/jrpc2"
+	"github.com/stretchr/testify/assert"
 )
 
 //// This section (below) is for method json marshalling,
diff --git a/jrpc2/jsonrpc_cases_test.go b/jrpc2/jsonrpc_cases_test.go
@@ -1,13 +1,14 @@
 package jrpc2_test
 
 import (
-	"github.com/sputn1ck/glightning/jrpc2"
-	"github.com/stretchr/testify/assert"
 	"net"
 	"os"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/elementsproject/glightning/jrpc2"
+	"github.com/stretchr/testify/assert"
 )
 
 // Test methods

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@ package main`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- "github.com/sputn1ck/glightning/glightning"`
`6`	`5`	`"sync"`
	`6`	`+`
	`7`	`+ "github.com/elementsproject/glightning/glightning"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"sync/atomic"`
`16`	`16`	`"time"`
`17`	`17`
`18`		`- "github.com/sputn1ck/glightning/jrpc2"`
	`18`	`+ "github.com/elementsproject/glightning/jrpc2"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`// taken from bitcoind`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/sputn1ck/glightning`
	`1`	`+module github.com/elementsproject/glightning`
`2`	`2`
`3`	`3`	`go 1.16`
`4`	`4`