From 1b72161da26cb5cfced4068b89155ca61aa78d7f Mon Sep 17 00:00:00 2001 From: "renjithkn@gmail.com" Date: Tue, 1 Feb 2022 06:22:14 +0000 Subject: [PATCH] Signed-off-by: Renjith K N ERC20 token review fix Signed-off-by: renjithkn@gmail.com --- .../src/main/java/org/example/TokenERC20Contract.java | 11 ++++++++++- .../src/test/org/example/ChaincodeStubNaiveImpl.java | 1 - .../src/test/org/example/TokenERC20ContractTest.java | 10 +--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/token-erc-20/chaincode-java/src/main/java/org/example/TokenERC20Contract.java b/token-erc-20/chaincode-java/src/main/java/org/example/TokenERC20Contract.java index 0bb42746..aa5d6e82 100644 --- a/token-erc-20/chaincode-java/src/main/java/org/example/TokenERC20Contract.java +++ b/token-erc-20/chaincode-java/src/main/java/org/example/TokenERC20Contract.java @@ -1,6 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 */ + package org.example; import org.hyperledger.fabric.contract.Context; @@ -35,7 +36,7 @@ public final class TokenERC20Contract implements ContractInterface { /** - * @Desc Return the name of the token - e.g. "MyToken". The original function name is `name` in + * @Desc: Return the name of the token - e.g. "MyToken". The original function name is `name` in * ERC20 specification. However, 'name' conflicts with a parameter `name` in `Contract` class. As * a work around, we use `TokenName` as an alternative function name. * @param ctx the transaction context @@ -188,6 +189,14 @@ public final class TokenERC20Contract implements ContractInterface { .put(VALUE, valueInt).toString().getBytes(UTF_8)); } + + /** + * + * @param ctx + * @param _from + * @param _to + * @param _value + */ private void doTransfer(final Context ctx, final String _from, final String _to, long _value) { diff --git a/token-erc-20/chaincode-java/src/test/org/example/ChaincodeStubNaiveImpl.java b/token-erc-20/chaincode-java/src/test/org/example/ChaincodeStubNaiveImpl.java index 60f73d83..10939c70 100644 --- a/token-erc-20/chaincode-java/src/test/org/example/ChaincodeStubNaiveImpl.java +++ b/token-erc-20/chaincode-java/src/test/org/example/ChaincodeStubNaiveImpl.java @@ -7,7 +7,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -//import org.hyperledger.fabric.samples.fabcar.TestUtil; import org.hyperledger.fabric.protos.msp.Identities.SerializedIdentity; import org.hyperledger.fabric.protos.peer.ChaincodeEventPackage; diff --git a/token-erc-20/chaincode-java/src/test/org/example/TokenERC20ContractTest.java b/token-erc-20/chaincode-java/src/test/org/example/TokenERC20ContractTest.java index c653ff4e..4bad4045 100644 --- a/token-erc-20/chaincode-java/src/test/org/example/TokenERC20ContractTest.java +++ b/token-erc-20/chaincode-java/src/test/org/example/TokenERC20ContractTest.java @@ -299,15 +299,7 @@ public class TokenERC20ContractTest { @Test public void allowanceTransferFromTest() throws Exception { - /* - * ChaincodeStub localStub = new ChaincodeStubNaiveImpl(); ((ChaincodeStubNaiveImpl) - * localStub).setCertificate(ChaincodeStubNaiveImpl.CERT_WITH_DNS); Context localCtx = - * mock(Context.class); ClientIdentity localidentity = new ClientIdentity(localStub); - * when(localCtx.getClientIdentity()).thenReturn(localidentity); - * when(localCtx.getStub()).thenReturn(localStub); - */ - - String spender = "x509::CN=User1@org2.example.com, L=San Francisco, ST=California," + String spender = "x509::CN=User1@org2.example.com, L=San Francisco, ST=California," + " C=US::CN=ca.org2.example.com, O=org2.example.com, L=San Francisco, ST=California, C=US"; contract.approve(ctx, spender, "200");