Merge pull request #298 from xssnick/dev-v1-11

v1.11

Author: xssnick

README.md

@@ -4,7 +4,7 @@
 
 [![Based on TON][ton-svg]][ton]
 [![Telegram Channel][tgc-svg]][tg-channel]
-![Coverage](https://img.shields.io/badge/Coverage-73.6%25-brightgreen)
+![Coverage](https://img.shields.io/badge/Coverage-72.6%25-brightgreen)
 
 Golang library for interacting with TON blockchain.
 

address/addr.go

@@ -87,6 +87,17 @@ func (a *Address) BitsLen() uint {
 
 var crcTable = crc16.MakeTable(crc16.CRC16_XMODEM)
 
+func (a *Address) StringRaw() string {
+	switch a.addrType {
+	case NoneAddress:
+		return "NONE"
+	case StdAddress:
+		return strconv.Itoa(int(a.workchain)) + ":" + hex.EncodeToString(a.data)
+	default:
+		return "NOT_SUPPORTED"
+	}
+}
+
 func (a *Address) String() string {
 	switch a.addrType {
 	case NoneAddress:
@@ -118,28 +129,6 @@ func (a *Address) String() string {
 	}
 }
 
-func (a *Address) StringToBytes(dst []byte, addr []byte) {
-	switch a.addrType {
-	case NoneAddress:
-		copy(dst, []byte("NONE"))
-		return
-	case StdAddress:
-		copy(addr[0:34], a.prepareChecksumData())
-		binary.BigEndian.PutUint16(addr[34:], crc16.Checksum(addr[:34], crcTable))
-		base64.RawURLEncoding.Encode(dst, addr[:])
-		return
-	case ExtAddress:
-		copy(dst, []byte("EXT_ADDRESS"))
-		return
-	case VarAddress:
-		copy(dst, []byte("VAR_ADDRESS"))
-		return
-	default:
-		copy(dst, []byte("NOT_SUPPORTED"))
-		return
-	}
-}
-
 func (a *Address) MarshalJSON() ([]byte, error) {
 	return []byte(fmt.Sprintf("%q", a.String())), nil
 }

address/addr_test.go

@@ -708,3 +708,26 @@ func TestAddress_UnmarshalJSON(t *testing.T) {
 		})
 	}
 }
+
+func TestAddress_ToRaw(t *testing.T) {
+	a := MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	if v := a.StringRaw(); v != "0:ba295e33b3c4c9b5265aa4ead1166a92931ce9abea120a8c5e91044a1257f89c" {
+		t.Fatal("address incorrect:", v)
+	}
+}
+
+func TestAddress_Flags(t *testing.T) {
+	a := MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I").Testnet(true).Bounce(false)
+	if v := a.String(); v != "0QC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nMsH" {
+		t.Fatal("address incorrect:", v)
+	}
+}
+
+func TestAddress_Eq(t *testing.T) {
+	a := MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	b := MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I").Bounce(false)
+
+	if !a.Equals(b) {
+		t.Fatal("not eq")
+	}
+}