small fixes

Author: setavenger

src/core/block_test.go

@@ -0,0 +1,35 @@
+package core
+
+import (
+	"SilentPaymentAppBackend/src/common/types"
+	"SilentPaymentAppBackend/src/testhelpers"
+	"fmt"
+	"log"
+	"testing"
+)
+
+func TestBlockAnalysis(t *testing.T) {
+	var block types.Block
+	err := testhelpers.LoadBlockFromFile("/Users/setorblagogee/dev/sp-test-dir/block-716120.json", &block)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	tweaks, err := ComputeTweaksForBlock(&block)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	for _, tweak := range tweaks {
+		fmt.Printf("%x - %s\n", tweak.TweakData, tweak.Txid)
+	}
+
+	for _, tx := range block.Txs {
+		for _, tweak := range tweaks {
+			if tx.Txid == tweak.Txid {
+				fmt.Printf("%x\n", tweak.TweakData)
+			}
+		}
+	}
+
+}

src/core/tweak.go

@@ -270,7 +270,7 @@ func ComputeTweakPerTx(tx types.Transaction) (*types.Tweak, error) {
 	summedKey, err := sumPublicKeys(pubKeys)
 	if err != nil {
 		if strings.Contains(err.Error(), "not on secp256k1 curve") {
-			common.WarningLogger.Println(err)
+			common.WarningLogger.Println(err, "-", tx.Txid)
 			return nil, nil
 		}
 		common.DebugLogger.Println("tx:", tx.Txid)

src/testhelpers/testhelpers.go

@@ -6,8 +6,8 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"log"
+	"os"
 	"testing"
 )
 
@@ -91,7 +91,7 @@ func LoadCaseData(t *testing.T) ([]TestCase, error) {
 	filePath := "../test_data/send_and_receive_test_vectors_with_type.json"
 
 	// Read the JSON file
-	data, err := ioutil.ReadFile(filePath)
+	data, err := os.ReadFile(filePath)
 	if err != nil {
 		t.Errorf("Error reading JSON file: %s", err)
 		return nil, err
@@ -109,10 +109,21 @@ func LoadCaseData(t *testing.T) ([]TestCase, error) {
 	return testCases, err
 }
 
-func LoadAndUnmarshalBlockFromFile(filePath string, block *types.Block) error {
+func LoadBlockFromFile(filePath string, block *types.Block) error {
+	// Read the JSON file
+	data, err := os.ReadFile(filePath)
+	if err != nil {
+		log.Println(err)
+		return err
+	}
 
+	// Unmarshal the JSON data into the struct
+	return json.Unmarshal(data, &block)
+}
+
+func LoadAndUnmarshalBlockFromFile(filePath string, block *types.Block) error {
 	// Read the JSON file
-	data, err := ioutil.ReadFile(filePath)
+	data, err := os.ReadFile(filePath)
 	if err != nil {
 		log.Println(err)
 		return err