Merge rust-bitcoin#4168: Move opcodes back to bitcoin

a743933 Move opcodes back to bitcoin (Tobin C. Harding)

Pull request description:

  Duplicate `opcodes` in `bitcoin` and hide it in `primitives` so we do not have to commit to the API.

  We use opcodes in `impl fmt::Display for Script`.

  Close: rust-bitcoin#4144

ACKs for top commit:
  apoelstra:
    ACK a743933; successfully ran local tests; sure
  Kixunil:
    ACK a743933

Tree-SHA512: 738685b9cd2288a581daa6219e3b21bd48bb4845ea627bf6b8085e0e48f5649ac5ec616a3421d10cd37543f76b66d31f94fd55bf94effc2fb8f91d1ecf5c8611

Author: apoelstra

bitcoin/src/blockdata/mod.rs

@@ -7,6 +7,7 @@
 
 pub mod block;
 pub mod constants;
+pub mod opcodes;
 pub mod script;
 pub mod transaction;
 pub mod witness;
@@ -70,12 +71,6 @@ pub mod locktime {
     }
 }
 
-/// Bitcoin script opcodes.
-pub mod opcodes {
-    /// Re-export everything from the [`primitives::opcodes`] module.
-    pub use primitives::opcodes::*;
-}
-
 /// Implements `Weight` and associated features.
 pub mod weight {
     /// Re-export everything from the [`units::weight`] module.

bitcoin/src/blockdata/opcodes.rs

@@ -61,12 +61,12 @@ use core::convert::Infallible;
 use core::fmt;
 
 use io::{BufRead, Write};
-use primitives::opcodes::all::*;
-use primitives::opcodes::Opcode;
 
 use crate::consensus::{encode, Decodable, Encodable};
 use crate::internal_macros::impl_asref_push_bytes;
 use crate::key::WPubkeyHash;
+use crate::opcodes::all::*;
+use crate::opcodes::Opcode;
 use crate::prelude::Vec;
 use crate::OutPoint;
 

bitcoin/src/blockdata/script/mod.rs

@@ -1,15 +1,14 @@
 // SPDX-License-Identifier: CC0-1.0
 
 use hex_lit::hex;
-use primitives::opcodes;
 
 use super::*;
 use crate::address::script_pubkey::{
     BuilderExt as _, ScriptBufExt as _, ScriptExt as _, ScriptExtPrivate as _,
 };
 use crate::consensus::encode::{deserialize, serialize};
 use crate::crypto::key::{PublicKey, XOnlyPublicKey};
-use crate::{Amount, FeeRate};
+use crate::{Amount, FeeRate, opcodes};
 
 #[test]
 #[rustfmt::skip]

bitcoin/src/blockdata/script/tests.rs

@@ -123,7 +123,6 @@ pub use primitives::{
         Unchecked as BlockUnchecked, Validation as BlockValidation, WitnessCommitment,
     },
     merkle_tree::{TxMerkleNode, WitnessMerkleNode},
-    opcodes::Opcode,
     pow::CompactTarget, // No `pow` module outside of `primitives`.
     script::{Script, ScriptBuf},
     sequence::{self, Sequence}, // No `sequence` module outside of `primitives`.
@@ -161,12 +160,13 @@ pub use crate::{
 pub use crate::{
     // Also, re-export types and modules from `blockdata` that don't come from `primitives`.
     blockdata::locktime::{absolute, relative},
+    blockdata::opcodes::{self, Opcode},
     blockdata::script::witness_program::{self, WitnessProgram},
     blockdata::script::witness_version::{self, WitnessVersion},
     blockdata::script::{ScriptHash, WScriptHash}, // TODO: Move these down below after they are in primitives.
     // These modules also re-export all the respective `primitives` types.
     blockdata::{
-        block, constants, fee_rate, locktime, opcodes, script, transaction, weight, witness,
+        block, constants, fee_rate, locktime, script, transaction, weight, witness,
     },
 };
 

bitcoin/src/lib.rs

@@ -44,7 +44,7 @@ pub mod _export {
 pub mod block;
 pub mod locktime;
 pub mod merkle_tree;
-pub mod opcodes;
+mod opcodes;
 pub mod pow;
 #[cfg(feature = "alloc")]
 pub mod script;
@@ -76,7 +76,6 @@ pub use self::{
     block::{BlockHash, Header as BlockHeader, WitnessCommitment},
     locktime::{absolute, relative},
     merkle_tree::{TxMerkleNode, WitnessMerkleNode},
-    opcodes::Opcode,
     pow::CompactTarget,
     sequence::Sequence,
     transaction::{OutPoint, Txid, Wtxid},

primitives/src/lib.rs

@@ -6,6 +6,7 @@
 //! all of the opcodes for that language.
 
 #![allow(non_camel_case_types)]
+#![allow(dead_code)]            // This module is private and is duplicated in `bitcoin`.
 
 use core::fmt;