update for new version

amt_test.go

@@ -174,19 +174,24 @@ func TestMaxRange(t *testing.T) {
 	a, err := NewAMT(bs)
 	require.NoError(t, err)
 
-	err = a.Set(ctx, MaxIndex, cborstr("what is up 1"))
+	err = a.Set(ctx, MaxIndex, cborstr("what is up"))
 	require.NoError(t, err)
+	require.Equal(t, a.height, 21)
 
-	err = a.Set(ctx, MaxIndex+1, cborstr("what is up 2"))
+	err = a.Set(ctx, MaxIndex+1, cborstr("what is up"))
 	require.Error(t, err)
 
+	err = a.Set(ctx, MaxIndex-1, cborstr("what is up"))
+	require.NoError(t, err)
+
 	c, err := a.Flush(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	assert.Equal(t, "bafy2bzacebggnpdo4sclwgg3rzewhgoxppjmkhyr6anq3adk24dlnmcfu5mty", c.String())
-	assert.Equal(t, bsStats{r: 0, w: 22, br: 0, bw: 1030}, trackingBs.stats)
+	assert.Equal(t, "bafy2bzacecl3zuubhdvkojg6uhbu4mebaehx554q6algfjitqiivvnrqprkxo", c.String())
+	assert.Equal(t, bsStats{r: 0, w: 22, br: 0, bw: 1039}, trackingBs.stats)
+	t.Fatal("here")
 }
 func TestMaxRange11(t *testing.T) {
 	ctx := context.Background()
@@ -1009,6 +1014,8 @@ func TestRoundTrip(t *testing.T) {
 	ctx := context.Background()
 	a, err := NewAMT(bs)
 	require.NoError(t, err)
+	emptyCid, err := a.Flush(ctx)
+	require.NoError(t, err)
 
 	k := uint64(100000)
 	assertSet(t, a, k, "foo")
@@ -1017,34 +1024,10 @@ func TestRoundTrip(t *testing.T) {
 	c, err := a.Flush(ctx)
 	require.NoError(t, err)
 
-	// // TODO fix this, this is testing locked in bug functionality
-	// // require.Equal(t, emptyCid, c)
-	// assert.Equal(t, "bafy2bzacedswlcz5ddgqnyo3sak3jmhmkxashisnlpq6ujgyhe4mlobzpnhs6", emptyCid.String())
-	// assert.Equal(t, "bafy2bzacec3ltjhtro3i4usbev24phgv6hb4fbfdaa2lxid4uod3zw4v3uce6", c.String())
-	// assert.Equal(t, bsStats{r: 0, w: 2, br: 0, bw: 16}, trackingBs.stats)
-
-	// // * This is just testing the bug functionality, remove if bug removed
-	// newAmt, err := LoadAMT(ctx, bs, c)
-	// if err != nil {
-	// 	t.Fatal(err)
-	// }
-	// assertSet(t, newAmt, 9, "foo")
-	// assertGet(ctx, t, newAmt, 9, "foo")
-	// assert.Equal(t, uint64(5), newAmt.height)
-	// assertSet(t, newAmt, 66, "bar")
-	// assertGet(ctx, t, newAmt, 66, "bar")
-	// assert.Equal(t, uint64(5), newAmt.height)
-	// assertSet(t, newAmt, 515, "baz")
-	// assertGet(ctx, t, newAmt, 515, "baz")
-	// assert.Equal(t, uint64(5), newAmt.height)
-
-	// assertDelete(t, newAmt, 9)
-	// assert.Equal(t, uint64(3), newAmt.height)
-	// assertDelete(t, newAmt, 515)
-	// assert.Equal(t, uint64(2), newAmt.height)
-
+	require.Equal(t, emptyCid, c)
+	assert.Equal(t, "bafy2bzacedijw74yui7otvo63nfl3hdq2vdzuy7wx2tnptwed6zml4vvz7wee", emptyCid.String())
 	assert.Equal(t, "bafy2bzacedijw74yui7otvo63nfl3hdq2vdzuy7wx2tnptwed6zml4vvz7wee", c.String())
-	assert.Equal(t, bsStats{r: 0, w: 1, br: 0, bw: 9}, trackingBs.stats)
+	assert.Equal(t, bsStats{r: 0, w: 2, br: 0, bw: 18}, trackingBs.stats)
 }
 func TestBadBitfield(t *testing.T) {
 	bs := cbor.NewCborStore(newMockBlocks())

go.txt

@@ -0,0 +1,30 @@
+=== RUN   TestExpand
+Put 834104808143666f6f
+Put 834108808143626172
+Put 83410382d82a5827000171a0e40220498830e8cbabc8b63fc60482d6dcb5284479c92e42d158239e01b1f4d4bf9f95d82a5827000171a0e402206d173bd641ab1cf7fc892a8a60b13c6adb8a3ffbf1e8ef07f8122033fa3ffab880
+Put 83418080814362617a
+Put 83410281d82a5827000171a0e40220bfb262a78ff5712ff71e0bfd47085323c82d199386c855def6fdd0b8767b8b5980
+Put 8403020383410382d82a5827000171a0e40220bddae276b0a4f6851040918a5901553fa4486af89603893fa8536ef38a7abe8ad82a5827000171a0e4022064aa091356f678c0203890f44e179bd5f920773974c7f08f530ee4360a48eed280
+bw 3
+bw 3
+bw 3
+new vals 8
+&{[67 102 111 111] 0}
+[4]
+here 2
+bw 3
+new vals 8
+&{[67 98 97 114] 0}
+[8]
+here 3
+bw 3
+bw 3
+new vals 8
+&{[67 98 97 122] 0}
+[128]
+here 7
+--- PASS: TestExpand (0.00s)
+PASS
+ok  	github.com/filecoin-project/go-amt-ipld/v3	0.294s
+?   	github.com/filecoin-project/go-amt-ipld/v3/gen	[no test files]
+?   	github.com/filecoin-project/go-amt-ipld/v3/internal	[no test files]

rust.txt

@@ -0,0 +1,12 @@
+
+running 1 test
+Put 834104808143666f6f
+Put 834108808143626172
+Put 83410382d82a5827000171a0e40220498830e8cbabc8b63fc60482d6dcb5284479c92e42d158239e01b1f4d4bf9f95d82a5827000171a0e402206d173bd641ab1cf7fc892a8a60b13c6adb8a3ffbf1e8ef07f8122033fa3ffab880
+Put 83418080814362617a
+Put 83410281d82a5827000171a0e40220bfb262a78ff5712ff71e0bfd47085323c82d199386c855def6fdd0b8767b8b5980
+Put 8403020383410382d82a5827000171a0e40220bddae276b0a4f6851040918a5901553fa4486af89603893fa8536ef38a7abe8ad82a5827000171a0e4022064aa091356f678c0203890f44e179bd5f920773974c7f08f530ee4360a48eed280
+test expand ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 11 filtered out
+