Remove deprecated code

*Remove dummy public keys in preference for EdDSA keys generated from fixed entropy sources, as a more accurate reflection of real uses. Also eliminates a serialization format issue with dummy keys which would have to be resolved otherwise.
* Remove deprecated 'by' keyword from contracts DSL
* Remove deprecated parts of CordaPluginRegistry
This commit is contained in:
Ross Nicoll
2017-08-15 01:17:36 +01:00
committed by GitHub
parent 62576b12b3
commit 8f8a5ff774
11 changed files with 52 additions and 107 deletions

View File

@ -28,13 +28,13 @@ import org.jetbrains.annotations.NotNull;
import java.security.GeneralSecurityException;
import java.security.PublicKey;
import java.security.SignatureException;
import java.time.Duration;
import java.time.Instant;
import java.util.List;
import java.util.Set;
import static net.corda.core.contracts.ContractsDSL.requireThat;
import static net.corda.testing.TestConstants.getDUMMY_PUBKEY_1;
import static net.corda.testing.TestConstants.getALICE_KEY;
// We group our two flows inside a singleton object to indicate that they work
// together.
@ -109,7 +109,7 @@ public class FlowCookbookJava {
// We'll be using a dummy public key for demonstration purposes.
// These are built in to Corda, and are generally used for writing
// tests.
PublicKey dummyPubKey = getDUMMY_PUBKEY_1();
PublicKey dummyPubKey = getALICE_KEY().getPublic();
/*---------------------------
* IDENTIFYING OTHER NODES *

View File

@ -23,7 +23,7 @@ import net.corda.core.utilities.ProgressTracker.Step
import net.corda.core.utilities.UntrustworthyData
import net.corda.core.utilities.seconds
import net.corda.core.utilities.unwrap
import net.corda.testing.DUMMY_PUBKEY_1
import net.corda.testing.ALICE_PUBKEY
import net.corda.testing.contracts.DummyContract
import net.corda.testing.contracts.DummyState
import org.bouncycastle.asn1.x500.X500Name
@ -92,7 +92,7 @@ object FlowCookbook {
// We'll be using a dummy public key for demonstration purposes.
// These are built in to Corda, and are generally used for writing
// tests.
val dummyPubKey: PublicKey = DUMMY_PUBKEY_1
val dummyPubKey: PublicKey = ALICE_PUBKEY
/**--------------------------
* IDENTIFYING OTHER NODES *