Update to allow extrabytes for addhashedleaf (#14)

honourfish · jgough · web-flow · commit 258367096822 · 2024-12-04T10:51:29.000Z
re: AB#10207

Co-authored-by: jgough &lt;joe.gough@datatrails.ai&gt;
diff --git a/go.mod b/go.mod
@@ -5,8 +5,8 @@ go 1.22
 require (
 	github.com/datatrails/go-datatrails-common v0.18.0
 	github.com/datatrails/go-datatrails-common-api-gen v0.4.5
-	github.com/datatrails/go-datatrails-merklelog/massifs v0.2.0
-	github.com/datatrails/go-datatrails-merklelog/mmr v0.1.0
+	github.com/datatrails/go-datatrails-merklelog/massifs v0.3.1
+	github.com/datatrails/go-datatrails-merklelog/mmr v0.1.1
 	github.com/datatrails/go-datatrails-merklelog/mmrtesting v0.1.0
 	github.com/datatrails/go-datatrails-simplehash v0.0.5
 	github.com/stretchr/testify v1.9.0
diff --git a/go.sum b/go.sum
@@ -44,10 +44,10 @@ github.com/datatrails/go-datatrails-common v0.18.0 h1:OeNP4EdIjhLHnE/mdN2/kp6Fq+
 github.com/datatrails/go-datatrails-common v0.18.0/go.mod h1:fBDqKHRLUYcictdWdLrIhKNhieKVE2r0II8vyETCuhM=
 github.com/datatrails/go-datatrails-common-api-gen v0.4.5 h1:QtxIFSdOEf6bhHZd7g/MfWdCWfPEtwTQNDz3K9u33+c=
 github.com/datatrails/go-datatrails-common-api-gen v0.4.5/go.mod h1:OQN91xvlW6xcWTFvwsM2Nn4PZwFAIOE52FG7yRl4QPQ=
-github.com/datatrails/go-datatrails-merklelog/massifs v0.2.0 h1:UK8SsH6X1a2MFSrKBCvSgwRGRy94ZDXsgXrAyBy6bDU=
-github.com/datatrails/go-datatrails-merklelog/massifs v0.2.0/go.mod h1:bISXyzOXbHJS2AANP1nc+07AJ+OlKDOs+wFP6oc2oSY=
-github.com/datatrails/go-datatrails-merklelog/mmr v0.1.0 h1:DKHY1rgLQ+8JoVZfSrMOwPytgQy7+oyYQ8EWHryEXE4=
-github.com/datatrails/go-datatrails-merklelog/mmr v0.1.0/go.mod h1:B/Kkz4joZTiTz0q/9FFAgHR+Tcn6UxtphMuCzamAc9Q=
+github.com/datatrails/go-datatrails-merklelog/massifs v0.3.1 h1:RR1FVJ85iCrZIoMzcfxPLZsPCYl7XvlZ4S8sm2TxFi8=
+github.com/datatrails/go-datatrails-merklelog/massifs v0.3.1/go.mod h1:3V08x15NPbzBTSrvjvgzUA0ADkxBRV7m3p5ODElmB2A=
+github.com/datatrails/go-datatrails-merklelog/mmr v0.1.1 h1:Ro2fYdDYxGGcPmudYuvPonx78GkdQuKwzrdknLR55cE=
+github.com/datatrails/go-datatrails-merklelog/mmr v0.1.1/go.mod h1:B/Kkz4joZTiTz0q/9FFAgHR+Tcn6UxtphMuCzamAc9Q=
 github.com/datatrails/go-datatrails-merklelog/mmrtesting v0.1.0 h1:q9RXtAGydXKSJjARnFObNu743cbfIOfERTXiiVa2tF4=
 github.com/datatrails/go-datatrails-merklelog/mmrtesting v0.1.0/go.mod h1:rWFjeK1NU7qnhl9+iKdjASpw/CkPwDAOPHsERYR7uEQ=
 github.com/datatrails/go-datatrails-simplehash v0.0.5 h1:igu4QRYO87RQXrJlqSm3fgMA2Q0F4jglWqBlfvKrXKQ=
diff --git a/integrationsupport/testcontext.go b/integrationsupport/testcontext.go
@@ -101,7 +101,7 @@ func GenerateTenantLog(tc *mmrtesting.TestContext, g TestGenerator, eventTotal i
 		mmrIndex := mc.RangeCount()
 
 		// add the generated event to the mmr
-		_, err1 = mc.AddHashedLeaf(sha256.New(), idTimestamp, []byte(ev.TenantIdentity), []byte(ev.GetIdentity()), leafValue)
+		_, err1 = mc.AddHashedLeaf(sha256.New(), idTimestamp, nil, []byte(ev.TenantIdentity), []byte(ev.GetIdentity()), leafValue)
 		if err1 != nil {
 			if errors.Is(err1, massifs.ErrMassifFull) {
 				var err2 error
@@ -114,7 +114,7 @@ func GenerateTenantLog(tc *mmrtesting.TestContext, g TestGenerator, eventTotal i
 					tc.T.Fatalf("unexpected err: %v", err)
 				}
 
-				_, err1 = mc.AddHashedLeaf(sha256.New(), idTimestamp, []byte(ev.TenantIdentity), []byte(ev.GetIdentity()), leafValue)
+				_, err1 = mc.AddHashedLeaf(sha256.New(), idTimestamp, nil, []byte(ev.TenantIdentity), []byte(ev.GetIdentity()), leafValue)
 			}
 
 			require.Nil(tc.T, err1)

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func GenerateTenantLog(tc *mmrtesting.TestContext, g TestGenerator, eventTotal i`
`101`	`101`	`mmrIndex := mc.RangeCount()`
`102`	`102`
`103`	`103`	`// add the generated event to the mmr`
`104`		`- _, err1 = mc.AddHashedLeaf(sha256.New(), idTimestamp, []byte(ev.TenantIdentity), []byte(ev.GetIdentity()), leafValue)`
	`104`	`+ _, err1 = mc.AddHashedLeaf(sha256.New(), idTimestamp, nil, []byte(ev.TenantIdentity), []byte(ev.GetIdentity()), leafValue)`
`105`	`105`	`if err1 != nil {`
`106`	`106`	`if errors.Is(err1, massifs.ErrMassifFull) {`
`107`	`107`	`var err2 error`
`@@ -114,7 +114,7 @@ func GenerateTenantLog(tc *mmrtesting.TestContext, g TestGenerator, eventTotal i`
`114`	`114`	`tc.T.Fatalf("unexpected err: %v", err)`
`115`	`115`	`}`
`116`	`116`
`117`		`- _, err1 = mc.AddHashedLeaf(sha256.New(), idTimestamp, []byte(ev.TenantIdentity), []byte(ev.GetIdentity()), leafValue)`
	`117`	`+ _, err1 = mc.AddHashedLeaf(sha256.New(), idTimestamp, nil, []byte(ev.TenantIdentity), []byte(ev.GetIdentity()), leafValue)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`require.Nil(tc.T, err1)`