resolve conflicts

solana-labs · Jul 8, 2021 · 52a9e26 · 52a9e26
1 parent f308ab2
commit 52a9e26
Show file tree

Hide file tree

Showing 7 changed files with 136 additions and 124 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/programs/bpf/rust/secp256k1_recover/Cargo.toml b/programs/bpf/rust/secp256k1_recover/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-rust-secp256k1-recover"
-version = "1.8.0"
+version = "1.7.5"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-bpf-rust-secp256k1-recover"
 edition = "2018"
 
 [dependencies]
-solana-program = { path = "../../../../sdk/program", version = "=1.8.0" }
+solana-program = { path = "../../../../sdk/program", version = "=1.7.5" }
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
@@ -1281,16 +1281,10 @@ fn assert_instruction_count() {
             ("noop", 42),
             ("noop++", 42),
             ("relative_call", 10),
-<<<<<<< HEAD
             ("sanity", 174),
             ("sanity++", 174),
-            ("sha", 694),
-=======
-            ("sanity", 169),
-            ("sanity++", 168),
             ("secp256k1_recover", 357),
-            ("sha", 1040),
->>>>>>> 1f288ce52 (Add ecrecover syscall (#17720))
+            ("sha", 694),
             ("struct_pass", 8),
             ("struct_ret", 22),
         ]);
@@ -1309,16 +1303,10 @@ fn assert_instruction_count() {
             ("solana_bpf_rust_membuiltins", 4069),
             ("solana_bpf_rust_noop", 495),
             ("solana_bpf_rust_param_passing", 46),
-<<<<<<< HEAD
             ("solana_bpf_rust_rand", 498),
             ("solana_bpf_rust_sanity", 917),
-            ("solana_bpf_rust_sha", 29099),
-=======
-            ("solana_bpf_rust_rand", 481),
-            ("solana_bpf_rust_sanity", 900),
-            ("solana_bpf_rust_secp256k1_recover", 301),
-            ("solana_bpf_rust_sha", 32333),
->>>>>>> 1f288ce52 (Add ecrecover syscall (#17720))
+            ("solana_bpf_rust_secp256k1_recover", 306),
+            ("solana_bpf_rust_sha", 29131),
         ]);
     }
 

diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml
@@ -15,12 +15,8 @@ byteorder = "1.3.4"
 log = "0.4.11"
 num-derive = "0.3"
 num-traits = "0.2"
-<<<<<<< HEAD
 rand_core = "0.6.2"
-=======
-rand_core = "0.6.3"
 libsecp256k1 = "0.5.0"
->>>>>>> 1f288ce52 (Add ecrecover syscall (#17720))
 sha3 = "0.9.1"
 solana-measure = { path = "../../measure", version = "=1.7.5" }
 solana-runtime = { path = "../../runtime", version = "=1.7.5" }