Update to new go-slip44; Filecoin, Elrond (#23)

optout21 · Catenocrypt · web-flow · commit c73bd509fcae · 2020-12-16T09:44:13.000+08:00
Co-authored-by: Catenocrypt &lt;catenocrypt@users.noreply.github.com&gt;
diff --git a/elrond.go b/elrond.go
@@ -1,14 +1,15 @@
 package coincodec
 
+import "github.com/wealdtech/go-slip44"
+
 const (
 	hrpElrond           = "erd"
 	ElrondKeyhashLength = 32
 )
 
 func init() {
-	// 508 slip44.ELROND
-	toBytesMap[508] = ElrondDecodeToBytes
-	toStringMap[508] = ElrondEncodeToString
+	toBytesMap[slip44.ELROND] = ElrondDecodeToBytes
+	toStringMap[slip44.ELROND] = ElrondEncodeToString
 }
 
 // ElrondDecodeToBytes converts the input string to a byte array
diff --git a/elrond_test.go b/elrond_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/pkg/errors"
+	"github.com/wealdtech/go-slip44"
 )
 
 func TestElrondEncodeToBytes(t *testing.T) {
@@ -61,8 +62,7 @@ func TestElrondEncodeToBytes(t *testing.T) {
 		},
 	}
 
-	// 508 slip44.ELROND
-	RunTestsEncode(t, 508, tests)
+	RunTestsEncode(t, slip44.ELROND, tests)
 }
 
 func TestElrondDecodeToString(t *testing.T) {
@@ -95,6 +95,5 @@ func TestElrondDecodeToString(t *testing.T) {
 		},
 	}
 
-	// 508 slip44.ELROND
-	RunTestsDecode(t, 508, tests)
+	RunTestsDecode(t, slip44.ELROND, tests)
 }
diff --git a/filecoin.go b/filecoin.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"strconv"
 
+	"github.com/wealdtech/go-slip44"
 	"golang.org/x/crypto/blake2b"
 )
 
@@ -30,9 +31,8 @@ const (
 )
 
 func init() {
-	// 461 slip44.FILECOIN
-	toBytesMap[461] = FilecoinDecodeToBytes
-	toStringMap[461] = FilecoinEncodeToString
+	toBytesMap[slip44.FILECOIN] = FilecoinDecodeToBytes
+	toStringMap[slip44.FILECOIN] = FilecoinEncodeToString
 }
 
 // Attempts to get the type by ASCII.
diff --git a/filecoin_test.go b/filecoin_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/pkg/errors"
+	"github.com/wealdtech/go-slip44"
 )
 
 func TestFilecoinToBytes(t *testing.T) {
@@ -205,8 +206,7 @@ func TestFilecoinToBytes(t *testing.T) {
 		},
 	}
 
-	// 461 slip44.FILECOIN
-	RunTestsEncode(t, 461, tests)
+	RunTestsEncode(t, slip44.FILECOIN, tests)
 }
 
 func TestFilecoinToString(t *testing.T) {
@@ -363,8 +363,7 @@ func TestFilecoinToString(t *testing.T) {
 		},
 	}
 
-	// 461 slip44.FILECOIN
-	RunTestsDecode(t, 461, tests)
+	RunTestsDecode(t, slip44.FILECOIN, tests)
 }
 
 func TestFilecoinTypes(t *testing.T) {
diff --git a/go.mod b/go.mod
@@ -8,6 +8,6 @@ require (
 	github.com/cpacia/bchutil v0.0.0-20181003130114-b126f6a35b6c
 	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
 	github.com/pkg/errors v0.8.1
-	github.com/wealdtech/go-slip44 v1.0.0
+	github.com/wealdtech/go-slip44 v1.1.0
 	golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708
 )
diff --git a/go.sum b/go.sum
@@ -29,6 +29,8 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/wealdtech/go-slip44 v1.0.0 h1:g0Wi5EufdD/ULZ4hcZKQ3TGlA6FZhGTCkmVzYmf+7Is=
 github.com/wealdtech/go-slip44 v1.0.0/go.mod h1://S3V9M6iN1cCflLXMjJYciRPakCDubG9YpWVyW1AvM=
+github.com/wealdtech/go-slip44 v1.1.0 h1:vOA63sYUpRSFSskbpYC4/WH910bWf8xn46KAJY6XFgk=
+github.com/wealdtech/go-slip44 v1.1.0/go.mod h1://S3V9M6iN1cCflLXMjJYciRPakCDubG9YpWVyW1AvM=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44 h1:9lP3x0pW80sDI6t1UMSLA4to18W7R7imwAI/sWS9S8Q=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`	`6`	`"github.com/pkg/errors"`
	`7`	`+ "github.com/wealdtech/go-slip44"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`func TestElrondEncodeToBytes(t *testing.T) {`
`@@ -61,8 +62,7 @@ func TestElrondEncodeToBytes(t *testing.T) {`
`61`	`62`	`},`
`62`	`63`	`}`
`63`	`64`
`64`		`- // 508 slip44.ELROND`
`65`		`- RunTestsEncode(t, 508, tests)`
	`65`	`+ RunTestsEncode(t, slip44.ELROND, tests)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`func TestElrondDecodeToString(t *testing.T) {`
`@@ -95,6 +95,5 @@ func TestElrondDecodeToString(t *testing.T) {`
`95`	`95`	`},`
`96`	`96`	`}`
`97`	`97`
`98`		`- // 508 slip44.ELROND`
`99`		`- RunTestsDecode(t, 508, tests)`
	`98`	`+ RunTestsDecode(t, slip44.ELROND, tests)`
`100`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"errors"`
`7`	`7`	`"strconv"`
`8`	`8`
	`9`	`+ "github.com/wealdtech/go-slip44"`
`9`	`10`	`"golang.org/x/crypto/blake2b"`
`10`	`11`	`)`
`11`	`12`
`@@ -30,9 +31,8 @@ const (`
`30`	`31`	`)`
`31`	`32`
`32`	`33`	`func init() {`
`33`		`- // 461 slip44.FILECOIN`
`34`		`- toBytesMap[461] = FilecoinDecodeToBytes`
`35`		`- toStringMap[461] = FilecoinEncodeToString`
	`34`	`+ toBytesMap[slip44.FILECOIN] = FilecoinDecodeToBytes`
	`35`	`+ toStringMap[slip44.FILECOIN] = FilecoinEncodeToString`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// Attempts to get the type by ASCII.`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ require (`
`8`	`8`	`github.com/cpacia/bchutil v0.0.0-20181003130114-b126f6a35b6c`
`9`	`9`	`github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1`
`10`	`10`	`github.com/pkg/errors v0.8.1`
`11`		`- github.com/wealdtech/go-slip44 v1.0.0`
	`11`	`+ github.com/wealdtech/go-slip44 v1.1.0`
`12`	`12`	`golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708`
`13`	`13`	`)`