epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-23 01:55:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Use numbers without leading zeroes for key

Browse source 
Signed-off-by: Stefan Obermeier <scray@stefan-obermeier.de>
This commit is contained in:
Stefan Obermeier 2020-04-04 01:22:59 +02:00
parent da41afabbf
commit 3e72a249ac
2 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/FabCar.java
View file

@ -95,7 +95,7 @@ public final class FabCar implements ContractInterface {
};
for (int i = 0; i < carData.length; i++) {
String key = String.format("CAR%03d", i);
String key = String.format("CAR%d", i);
Car car = genson.deserialize(carData[i], Car.class);
String carState = genson.serialize(car);

60
chaincode/fabcar/java/src/test/java/org/hyperledger/fabric/samples/fabcar/FabCarTest.java
View file

@ -63,15 +63,15 @@ public final class FabCarTest {
carList = new ArrayList<KeyValue>();
carList.add(new MockKeyValue("CAR000",
carList.add(new MockKeyValue("CAR0",
"{\"color\":\"blue\",\"make\":\"Toyota\",\"model\":\"Prius\",\"owner\":\"Tomoko\"}"));
carList.add(new MockKeyValue("CAR001",
carList.add(new MockKeyValue("CAR1",
"{\"color\":\"red\",\"make\":\"Ford\",\"model\":\"Mustang\",\"owner\":\"Brad\"}"));
carList.add(new MockKeyValue("CAR002",
carList.add(new MockKeyValue("CAR2",
"{\"color\":\"green\",\"make\":\"Hyundai\",\"model\":\"Tucson\",\"owner\":\"Jin Soo\"}"));
carList.add(new MockKeyValue("CAR007",
carList.add(new MockKeyValue("CAR7",
"{\"color\":\"violet\",\"make\":\"Fiat\",\"model\":\"Punto\",\"owner\":\"Pari\"}"));
carList.add(new MockKeyValue("CAR009",
carList.add(new MockKeyValue("CAR9",
"{\"color\":\"brown\",\"make\":\"Holden\",\"model\":\"Barina\",\"owner\":\"Shotaro\"}"));
}
@ -112,10 +112,10 @@ public final class FabCarTest {
Context ctx = mock(Context.class);
ChaincodeStub stub = mock(ChaincodeStub.class);
when(ctx.getStub()).thenReturn(stub);
when(stub.getStringState("CAR000"))
when(stub.getStringState("CAR0"))
.thenReturn("{\"color\":\"blue\",\"make\":\"Toyota\",\"model\":\"Prius\",\"owner\":\"Tomoko\"}");
Car car = contract.queryCar(ctx, "CAR000");
Car car = contract.queryCar(ctx, "CAR0");
assertThat(car).isEqualTo(new Car("Toyota", "Prius", "blue", "Tomoko"));
}
@ -126,14 +126,14 @@ public final class FabCarTest {
Context ctx = mock(Context.class);
ChaincodeStub stub = mock(ChaincodeStub.class);
when(ctx.getStub()).thenReturn(stub);
when(stub.getStringState("CAR000")).thenReturn("");
when(stub.getStringState("CAR0")).thenReturn("");
Throwable thrown = catchThrowable(() -> {
contract.queryCar(ctx, "CAR000");
contract.queryCar(ctx, "CAR0");
});
assertThat(thrown).isInstanceOf(ChaincodeException.class).hasNoCause()
.hasMessage("Car CAR000 does not exist");
.hasMessage("Car CAR0 does not exist");
assertThat(((ChaincodeException) thrown).getPayload()).isEqualTo("CAR_NOT_FOUND".getBytes());
}
}
@ -148,25 +148,25 @@ public final class FabCarTest {
contract.initLedger(ctx);
InOrder inOrder = inOrder(stub);
inOrder.verify(stub).putStringState("CAR000",
inOrder.verify(stub).putStringState("CAR0",
"{\"color\":\"blue\",\"make\":\"Toyota\",\"model\":\"Prius\",\"owner\":\"Tomoko\"}");
inOrder.verify(stub).putStringState("CAR001",
inOrder.verify(stub).putStringState("CAR1",
"{\"color\":\"red\",\"make\":\"Ford\",\"model\":\"Mustang\",\"owner\":\"Brad\"}");
inOrder.verify(stub).putStringState("CAR002",
inOrder.verify(stub).putStringState("CAR2",
"{\"color\":\"green\",\"make\":\"Hyundai\",\"model\":\"Tucson\",\"owner\":\"Jin Soo\"}");
inOrder.verify(stub).putStringState("CAR003",
inOrder.verify(stub).putStringState("CAR3",
"{\"color\":\"yellow\",\"make\":\"Volkswagen\",\"model\":\"Passat\",\"owner\":\"Max\"}");
inOrder.verify(stub).putStringState("CAR004",
inOrder.verify(stub).putStringState("CAR4",
"{\"color\":\"black\",\"make\":\"Tesla\",\"model\":\"S\",\"owner\":\"Adrian\"}");
inOrder.verify(stub).putStringState("CAR005",
inOrder.verify(stub).putStringState("CAR5",
"{\"color\":\"purple\",\"make\":\"Peugeot\",\"model\":\"205\",\"owner\":\"Michel\"}");
inOrder.verify(stub).putStringState("CAR006",
inOrder.verify(stub).putStringState("CAR6",
"{\"color\":\"white\",\"make\":\"Chery\",\"model\":\"S22L\",\"owner\":\"Aarav\"}");
inOrder.verify(stub).putStringState("CAR007",
inOrder.verify(stub).putStringState("CAR7",
"{\"color\":\"violet\",\"make\":\"Fiat\",\"model\":\"Punto\",\"owner\":\"Pari\"}");
inOrder.verify(stub).putStringState("CAR008",
inOrder.verify(stub).putStringState("CAR8",
"{\"color\":\"indigo\",\"make\":\"Tata\",\"model\":\"nano\",\"owner\":\"Valeria\"}");
inOrder.verify(stub).putStringState("CAR009",
inOrder.verify(stub).putStringState("CAR9",
"{\"color\":\"brown\",\"make\":\"Holden\",\"model\":\"Barina\",\"owner\":\"Shotaro\"}");
}
@ -179,15 +179,15 @@ public final class FabCarTest {
Context ctx = mock(Context.class);
ChaincodeStub stub = mock(ChaincodeStub.class);
when(ctx.getStub()).thenReturn(stub);
when(stub.getStringState("CAR000"))
when(stub.getStringState("CAR0"))
.thenReturn("{\"color\":\"blue\",\"make\":\"Toyota\",\"model\":\"Prius\",\"owner\":\"Tomoko\"}");
Throwable thrown = catchThrowable(() -> {
contract.createCar(ctx, "CAR000", "Nissan", "Leaf", "green", "Siobhán");
contract.createCar(ctx, "CAR0", "Nissan", "Leaf", "green", "Siobhán");
});
assertThat(thrown).isInstanceOf(ChaincodeException.class).hasNoCause()
.hasMessage("Car CAR000 already exists");
.hasMessage("Car CAR0 already exists");
assertThat(((ChaincodeException) thrown).getPayload()).isEqualTo("CAR_ALREADY_EXISTS".getBytes());
}
@ -197,9 +197,9 @@ public final class FabCarTest {
Context ctx = mock(Context.class);
ChaincodeStub stub = mock(ChaincodeStub.class);
when(ctx.getStub()).thenReturn(stub);
when(stub.getStringState("CAR000")).thenReturn("");
when(stub.getStringState("CAR0")).thenReturn("");
Car car = contract.createCar(ctx, "CAR000", "Nissan", "Leaf", "green", "Siobhán");
Car car = contract.createCar(ctx, "CAR0", "Nissan", "Leaf", "green", "Siobhán");
assertThat(car).isEqualTo(new Car("Nissan", "Leaf", "green", "Siobhán"));
}
@ -234,10 +234,10 @@ public final class FabCarTest {
Context ctx = mock(Context.class);
ChaincodeStub stub = mock(ChaincodeStub.class);
when(ctx.getStub()).thenReturn(stub);
when(stub.getStringState("CAR000"))
when(stub.getStringState("CAR0"))
.thenReturn("{\"color\":\"blue\",\"make\":\"Toyota\",\"model\":\"Prius\",\"owner\":\"Tomoko\"}");
Car car = contract.changeCarOwner(ctx, "CAR000", "Dr Evil");
Car car = contract.changeCarOwner(ctx, "CAR0", "Dr Evil");
assertThat(car).isEqualTo(new Car("Toyota", "Prius", "blue", "Dr Evil"));
}
@ -248,14 +248,14 @@ public final class FabCarTest {
Context ctx = mock(Context.class);
ChaincodeStub stub = mock(ChaincodeStub.class);
when(ctx.getStub()).thenReturn(stub);
when(stub.getStringState("CAR000")).thenReturn("");
when(stub.getStringState("CAR0")).thenReturn("");
Throwable thrown = catchThrowable(() -> {
contract.changeCarOwner(ctx, "CAR000", "Dr Evil");
contract.changeCarOwner(ctx, "CAR0", "Dr Evil");
});
assertThat(thrown).isInstanceOf(ChaincodeException.class).hasNoCause()
.hasMessage("Car CAR000 does not exist");
.hasMessage("Car CAR0 does not exist");
assertThat(((ChaincodeException) thrown).getPayload()).isEqualTo("CAR_NOT_FOUND".getBytes());
}
}