remove some KVP constructors

Author: esaulpaugh

src/main/java/com/esaulpaugh/headlong/rlp/KVP.java

@@ -51,19 +51,11 @@ public KVP(String keyUtf8, String val, int valEncoding) {
         this(keyUtf8, Strings.decode(val, valEncoding));
     }
 
-    public KVP(String keyUtf8, byte[] rawVal) {
-        this(Strings.decode(keyUtf8, UTF_8), rawVal);
-    }
-
-    public KVP(byte[] key, byte[] value) {
-        this.rlp = RLPEncoder.sequence(key, value);
+    public KVP(String keyUtf8, byte[] val) {
+        this.rlp = RLPEncoder.sequence(Strings.decode(keyUtf8, UTF_8), val);
         this.key = RLP_STRICT.wrapString(rlp);
     }
 
-    public KVP(String keyUtf8, RLPItem value) {
-        this(RLP_STRICT.wrapString(RLPEncoder.string(Strings.decode(keyUtf8, UTF_8))), value);
-    }
-
     public KVP(RLPString key, RLPItem value) {
         final int keyLen = key.encodingLength();
         this.rlp = new byte[keyLen + value.encodingLength()];

src/test/java/com/esaulpaugh/headlong/rlp/EIP778Test.java

@@ -34,6 +34,7 @@
 import java.util.Set;
 
 import static com.esaulpaugh.headlong.TestUtils.assertThrown;
+import static com.esaulpaugh.headlong.rlp.KVP.CLIENT;
 import static com.esaulpaugh.headlong.rlp.KVP.EMPTY_ARRAY;
 import static com.esaulpaugh.headlong.rlp.KVP.ID;
 import static com.esaulpaugh.headlong.rlp.KVP.IP;
@@ -340,11 +341,10 @@ public byte[] sign(byte[] content) {
 
     @Test
     public void testDuplicateKeys() throws Throwable {
-        byte[] keyBytes = new byte[0];
-        final List<KVP> pairs = Arrays.asList(new KVP(keyBytes, new byte[0]), new KVP(keyBytes, new byte[1]));
+        final List<KVP> pairs = Arrays.asList(new KVP("", new byte[0]), new KVP("", new byte[1]));
         assertThrown(IllegalArgumentException.class, "duplicate key", () -> pairs.sort(Comparator.naturalOrder()));
 
-        final List<KVP> pairs2 = Arrays.asList(new KVP(new byte[] { 2 }, new byte[0]), new KVP(new byte[] { 2 }, new byte[1]));
+        final List<KVP> pairs2 = Arrays.asList(new KVP("d", new byte[0]), new KVP("d", new byte[1]));
         assertThrown(IllegalArgumentException.class, "duplicate key", () -> pairs2.sort(Comparator.naturalOrder()));
     }
 
@@ -476,6 +476,9 @@ public void testOutOfOrder() throws Throwable {
     @Test
     public void testToString() {
         assertEquals("ip --> 3235352e3130312e302e313238", new KVP(IP, "255.101.0.128", ASCII).toString());
-        assertEquals("client --> [\"dd\", \"\"]", new KVP(KVP.CLIENT, RLPDecoder.RLP_STRICT.wrapBits(0xc482646480L)).toString());
+        assertEquals(
+                "client --> [\"dd\", \"\"]",
+                new KVP(RLPDecoder.RLP_STRICT.wrapString(RLPEncoder.string(Strings.decode(CLIENT, UTF_8))), RLPDecoder.RLP_STRICT.wrapBits(0xc482646480L)).toString()
+        );
     }
 }