WIP: committing feature complete code with debug output & a bunch of

comments & todos for @marbar3778 to catch up

Signed-off-by: Ismail Khoffi <[email protected]>

Author: liamsi

amino.go

@@ -230,37 +230,16 @@ func (cdc *Codec) MarshalBinaryBare(o interface{}) ([]byte, error) {
 	// If registered concrete, prepend prefix bytes by wrapping
 	// message in RegisteredAny:
 	if info.Registered {
-		fmt.Println(info.InterfaceInfo.AlwaysDisambiguate)
-		fmt.Println(info.Name)
-		fmt.Println(info.AlwaysDisambiguate)
-		fmt.Println(len(info.Implementers[info.Prefix]) > 1)
-		// if one of the interfaces this concrete type implements
-		// has set the AlwaysDisambiguate flag, we need to disambiguate.
-		isDisamb, _ := shouldDisamb(cdc, info)
-		disfix := make([]byte, 0)
-		if isDisamb {
-			disfix = append([]byte{0x00}, info.Disamb.Bytes()...)
-		}
-		disfix = append(disfix, info.Prefix.Bytes()...)
-		return MarshalBinaryBare(RegisteredAny{
-			AminoPreOrDisfix: disfix,
+		rAny := RegisteredAny{
+			AminoPreOrDisfix: info.Prefix.Bytes(),
 			Value:            bz,
-		})
+		}
+		return MarshalBinaryBare(rAny)
 	}
 
 	return bz, nil
 }
 
-func shouldDisamb(cdc *Codec, info *TypeInfo) (bool, *TypeInfo) {
-	for _, iinfo := range cdc.interfaceInfos {
-		if info.PtrToType.Implements(iinfo.Type) && iinfo.AlwaysDisambiguate {
-			fmt.Println("DISAMB", iinfo.Name)
-			return true, iinfo
-		}
-	}
-	return false, nil
-}
-
 // TODO: extensively document this!
 //
 // This will be compatible to the following proto3 message:

binary-encode.go

@@ -213,10 +213,12 @@ func (cdc *Codec) encodeReflectBinaryInterface(w io.Writer, iinfo *TypeInfo, rv
 	}
 	disfix := make([]byte, 0)
 	if needDisamb {
+		//  0x00 indicates that these are disfix bytes
 		disfix = append([]byte{0x00}, cinfo.Disamb[:]...)
 	}
 	disfix = append(disfix, cinfo.Prefix.Bytes()...)
 	aminoAny := &RegisteredAny{AminoPreOrDisfix: disfix}
+	fmt.Printf("disfix = %#v\n", disfix)
 	// Write actual concrete value.
 	err = cdc.encodeReflectBinary(buf, cinfo, crv, fopts, true)
 	if err != nil {

reflect_test.go

@@ -192,7 +192,7 @@ func TestCodecMarhsalBinaryBareRegisteredAndDisamb(t *testing.T) {
 
 	bz, err := cdc.MarshalBinaryBare(struct{ tests.Interface1 }{tests.Concrete1{}})
 	assert.NoError(t, err, "correctly registered")
-	assert.Equal(t, []byte{0xa, 0x6, 0xa, 0x4, 0xe3, 0xda, 0xb8, 0x33}, bz,
+	assert.Equal(t, []byte{0xa, 0xa, 0xa, 0x8, 0x0, 0x12, 0xb5, 0x86, 0xe3, 0xda, 0xb8, 0x33}, bz,
 		"prefix bytes did not match")
 }
 

tests/proto3/proto/compat.pb.go

@@ -84,6 +84,10 @@ message AminoRegisteredAny {
     bytes Value = 2;
 }
 
+message EmbeddedRegisteredAny {
+    AminoRegisteredAny F1 = 1;
+}
+
 message SimpleMsg {
     string Message = 1;
     int64 Height = 2;